diff --git a/ibus.changes b/ibus.changes
index e22e7ef..7575d75 100644
--- a/ibus.changes
+++ b/ibus.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed May 14 08:04:18 UTC 2014 - cxiong@suse.com
+
+- Let GNOME 3 handles ibus startup&setup. (bnc#873016)
+  * Changed xim.d-ibus-121.
+  * Reformatting the latter part of the xim.d-ibus-121.
+
 -------------------------------------------------------------------
 Mon Mar 17 15:37:25 UTC 2014 - ftake@geeko.jp
 
diff --git a/xim.d-ibus-121 b/xim.d-ibus-121
index f7d8c8d..7da256e 100644
--- a/xim.d-ibus-121
+++ b/xim.d-ibus-121
@@ -7,9 +7,9 @@ if ! type -p ibus-daemon > /dev/null 2>&1 ; then
     return 1
 fi
 
-#when skim installed, Autostart must be "false".
-#here we move $HOME/.kde/share/config/skimrc to skimrc.orig.ibus
 case "$WINDOWMANAGER" in
+    #when skim installed, Autostart must be "false".
+    #here we move $HOME/.kde/share/config/skimrc to skimrc.orig.ibus
     *kde*)
         if type -p skim > /dev/null 2>&1 \
           && ! grep -i -q "^[[:space:]]*Autostart.*=.*false" $HOME/.kde/share/config/skimrc
@@ -28,6 +28,16 @@ __END
     	:
         fi
     ;;
+    # GNOME 3 Settings Daemon keyboard plugin manages all ibus settings itself,
+    # so don't do manual setup&startup of ibus otherwise it would conflict with
+    # G-S-D. see bnc#873016.
+    *gnome-session*)
+        # make sure G-S-D keyboard plugin is active
+        echo "ibus will be managed by GNOME."
+        gsettings set org.gnome.settings-daemon.plugins.keyboard active true
+        PATH=$OLD_PATH
+        return 0
+    ;;
     *)
         # do nothing
     ;;
@@ -35,26 +45,26 @@ esac
 
 # Force OOo to use gtk-immodule
 # Better way to fix cursor following problem (on_the_spot bug) under libreoffice-kde4
-	    export OOO_FORCE_DESKTOP=gnome
+export OOO_FORCE_DESKTOP=gnome
 
 # Determine the LC_CTYPE locale category setting
 #tmplang=${LC_ALL-${LC_CTYPE-${LANG-en_US}}}
 
-            export LC_CTYPE=$LANG
-            export XMODIFIERS="@im=ibus" 
-            export GTK_IM_MODULE=ibus
-            export QT_IM_SWITCHER=imsw-multi
-            if [ -e /usr/$SYS_LIB/qt4/plugins/inputmethods/libqtim-ibus.so ]; then
-                    export QT_IM_MODULE=ibus
-            else
-                    export QT_IM_MODULE=xim
-            fi
+export LC_CTYPE=$LANG
+export XMODIFIERS="@im=ibus" 
+export GTK_IM_MODULE=ibus
+export QT_IM_SWITCHER=imsw-multi
+if [ -e /usr/$SYS_LIB/qt4/plugins/inputmethods/libqtim-ibus.so ]; then
+    export QT_IM_MODULE=ibus
+else
+    export QT_IM_MODULE=xim
+fi
 
-            if [ -z $DBUS_SESSION_BUS_ADDRESS ]; then
-                    eval `dbus-launch --sh-syntax --exit-with-session --close-stderr < /dev/null`
-            fi
+if [ -z $DBUS_SESSION_BUS_ADDRESS ]; then
+    eval `dbus-launch --sh-syntax --exit-with-session --close-stderr < /dev/null`
+fi
 
-            ibus-daemon --xim -d
+ibus-daemon --xim -d
 
 PATH=$OLD_PATH