diff --git a/gnome-session-check-dbus-update-activation-environment.patch b/gnome-session-check-dbus-update-activation-environment.patch
new file mode 100644
index 0000000..e3bf06d
--- /dev/null
+++ b/gnome-session-check-dbus-update-activation-environment.patch
@@ -0,0 +1,27 @@
+commit 4abdb7925c3bf91e0802e42bab6c90d9a3086b2e
+Author: Dominique Leuenberger <dimstar@opensuse.org>
+Date:   Tue Aug 16 16:15:21 2016 +0200
+
+    Do not report errors in absence of dbus-update-activation-environment
+    
+    dbus-update-activation-environment was introduced with dbus 1.10.4
+    gnome-session by itself does not depend on any specific version of
+    dbus at all - but on dbus-glib-1 (DBUS_GLIB_REQUIRED=0.76)
+    
+    The latest version of dbus-glib (ver 106) requires dbus-1 1.8: it is
+    thus a valid setup to run not have dbus-update-activation-environment
+    on the system. Warning the user about its absence is alerting users
+    for not reason.
+
+diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in
+index 6b2ba18..5f4b303 100644
+--- a/gnome-session/gnome-session.in
++++ b/gnome-session/gnome-session.in
+@@ -12,6 +12,6 @@ if [ -n "$REGION" ]; then
+   export LC_PAPER=$REGION
+ fi
+ 
+-dbus-update-activation-environment --all ||:
++dbus-update-activation-environment --all >& /dev/null ||:
+ 
+ exec @libexecdir@/gnome-session-binary "$@"
diff --git a/gnome-session.changes b/gnome-session.changes
index 6cb3065..ccc3b8c 100644
--- a/gnome-session.changes
+++ b/gnome-session.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Thu Aug 18 13:08:30 UTC 2016 - dimstar@opensuse.org
+
+- Update
+  gnome-session-check-dbus-update-activation-environment.patch: use
+  the upstream commited solution
+
+-------------------------------------------------------------------
+Tue Aug 16 10:19:26 UTC 2016 - fezhang@suse.com
+
+- Add gnome-session-check-dbus-update-activation-environment.patch:
+  Check if dbus-update-activation-environment exists before calling
+  it to silence warnings for SLE12 SP2 and LEAP 42.2 (bsc#993342,
+  bgo#768036).
+
 -------------------------------------------------------------------
 Sun Jul 17 12:04:34 UTC 2016 - fezhang@suse.com
 
diff --git a/gnome-session.spec b/gnome-session.spec
index 82e7f82..6614860 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -30,6 +30,8 @@ Source2:        gnome.desktop
 Patch0:         gnome-session-ice-auth-for-suid.patch
 # PATCH-FEATURE-UPSTREAM gnome-session-logging-to-systemd-journal-configurable.patch bsc#876685 bgo#768982 fezhang@suse.com -- Add a new configure switch for systemd journal support.
 Patch1:         gnome-session-logging-to-systemd-journal-configurable.patch
+# PATCH-FIX-UPSTREAM gnome-session-check-dbus-update-activation-environment.patch bsc#993342 bgo#768036 fezhang@suse.com -- Check existence of dbus-update-activation-environment before calling it to avoid warnings.
+Patch2:         gnome-session-check-dbus-update-activation-environment.patch
 BuildRequires:  autoconf
 BuildRequires:  fdupes
 BuildRequires:  intltool
@@ -107,6 +109,7 @@ translation-update-upstream
 %patch0 -p1
 %endif
 %patch1 -p1
+%patch2 -p1
 
 %build
 autoconf