diff --git a/ibus.changes b/ibus.changes
index 474d6d8..58e0ab5 100644
--- a/ibus.changes
+++ b/ibus.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Oct  8 14:01:39 UTC 2014 - ftake@geeko.jp
+
+- Add im-engines-precede-xkb.patch
+  * allow users to use an IM engine without any operation
+- Update the launch script
+  * remove the obsolete part for SKIM (bnc#860486)
+  * do not set OOO_FORCE_DESKTOP=gnome
+    if libreoffice-gnome is not installed (bnc#899045)
+
 -------------------------------------------------------------------
 Mon Sep  8 16:39:26 UTC 2014 - fcrozat@suse.com
 
diff --git a/ibus.spec b/ibus.spec
index 29f353a..cf03bbf 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -62,6 +62,9 @@ Patch5:         ibus-force-python3.patch
 Patch6:         ibus-vala-0.18.patch
 # PATCH-FIX-UPSTREAM marguerite@opensuse.org
 Patch7:         ibus-python3-migration.patch
+# PATCH-FIX-UPSTREAM ftake@geeko.jp
+# Select an IM engine at the first login
+Patch8:         im-engines-precede-xkb.patch
 BuildRequires:  dbus-1-glib-devel
 BuildRequires:  dbus-1-python-devel >= 0.83.0
 BuildRequires:  dconf-devel >= 0.7.5
@@ -232,6 +235,8 @@ sed -i \
 %patch7 -p1
 %endif
 
+%patch8 -p1
+
 cp -r %{SOURCE2} .
 cp -r %{SOURCE3} .
 
diff --git a/im-engines-precede-xkb.patch b/im-engines-precede-xkb.patch
new file mode 100644
index 0000000..3ee4b03
--- /dev/null
+++ b/im-engines-precede-xkb.patch
@@ -0,0 +1,24 @@
+commit 389d179c0b15664e23af2f26c17b3b5f316bc4e5
+Author: Fuminobu TAKEYAMA <ftake@geeko.jp>
+Date:   Tue Oct 7 20:23:42 2014 +0900
+
+    make IM engines precede xkb engines so that users can input
+    CJK letters without switching IMs at the first login
+
+diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
+index 76cea23..1ff56fb 100644
+--- a/ui/gtk3/panel.vala
++++ b/ui/gtk3/panel.vala
+@@ -411,10 +411,10 @@ class Panel : IBus.PanelService {
+                 get_engines_from_locale(engines);
+ 
+         string[] names = {};
+-        foreach (unowned IBus.EngineDesc engine in xkb_engines)
+-            names += engine.get_name();
+         foreach (unowned IBus.EngineDesc engine in im_engines)
+             names += engine.get_name();
++        foreach (unowned IBus.EngineDesc engine in xkb_engines)
++            names += engine.get_name();
+ 
+         m_settings_general.set_strv("preload-engines", names);
+     }
diff --git a/xim.d-ibus-121 b/xim.d-ibus-121
index c3beea1..ad7ec1d 100644
--- a/xim.d-ibus-121
+++ b/xim.d-ibus-121
@@ -1,9 +1,5 @@
-OLD_PATH=$PATH
-PATH=/usr/bin:/usr/X11R6/bin:/opt/kde3/bin:$PATH
-
 if ! type -p ibus-daemon > /dev/null 2>&1 ; then
     echo "ibus is not available."
-    PATH=$OLD_PATH
     return 1
 fi
 
@@ -11,22 +7,6 @@ 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
-        then
-            if [ -f $HOME/.kde/share/config/skimrc.orig.ibus ] ; then
-               mv -f $HOME/.kde/share/config/skimrc $HOME/.kde/share/config/skimrc.orig.ibus
-               chmod 777 $HOME/.kde/share/config/skimrc.orig.ibus
-            fi
-        cat > $HOME/.kde/share/config/skimrc << __END
-[General]
-Autostart=false
-__END
-        chmod 777 $HOME/.kde/share/config/skimrc
-        else
-        # do nothing
-    	:
-        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
@@ -56,11 +36,16 @@ __END
 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
-
-# Determine the LC_CTYPE locale category setting
-#tmplang=${LC_ALL-${LC_CTYPE-${LANG-en_US}}}
+# Only libreoffice-gnome supports IM module
+# To fix cursor following problem (on_the_spot), do not use libreoffice-kde4
+if [ -e /usr/lib64/libreoffice/program/libvclplug_gtklo.so ] ||
+   [ -e /usr/lib/libreoffice/program/libvclplug_gtklo.so ] ||
+   [ -e /usr/lib64/libreoffice/program/libvclplug_gtk3lo.so ] ||
+   [ -e /usr/lib/libreoffice/program/libvclplug_gtk3lo.so ]; then
+    export OOO_FORCE_DESKTOP=gnome
+else
+    echo "libreoffice-gnome is not found. For better IBus support, please install libreoffice-gnome"
+fi
 
 export LC_CTYPE=$LANG
 export XMODIFIERS="@im=ibus" 
@@ -78,7 +63,5 @@ fi
 
 ibus-daemon --xim -d
 
-PATH=$OLD_PATH
-
 # success:
 return 0