diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index 8b13789..88eca00 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -1 +1,30 @@
-
+diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
+index 68a77d8..d914eae 100644
+--- a/client/gtk2/ibusimcontext.c
++++ b/client/gtk2/ibusimcontext.c
+@@ -774,14 +774,22 @@ _ibus_context_update_preedit_text_cb (IBusInputContext  *ibuscontext,
+     ibusimcontext->preedit_visible = visible;
+ 
+     if (ibusimcontext->preedit_visible) {
+-        if (flag)
++        if (flag) {
++            /* invisible => visible */
+             g_signal_emit (ibusimcontext, _signal_preedit_start_id, 0);
++        }
+         g_signal_emit (ibusimcontext, _signal_preedit_changed_id, 0);
+     }
+     else {
+-        g_signal_emit (ibusimcontext, _signal_preedit_changed_id, 0);
+-        if (flag)
++        if (flag) {
++            /* visible => invisible */
++            g_signal_emit (ibusimcontext, _signal_preedit_changed_id, 0);
+             g_signal_emit (ibusimcontext, _signal_preedit_end_id, 0);
++        }
++        else {
++            /* still invisible */
++            /* do nothing */
++        }
+     }
+ }
+ 
diff --git a/ibus.spec b/ibus.spec
index b5351d1..8175d1b 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -8,14 +8,14 @@
 
 Name:       ibus
 Version:    1.2.0.20090807
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    xinput-ibus
-# Patch0:     ibus-HEAD.patch
+Patch0:     ibus-HEAD.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -114,7 +114,7 @@ The ibus-devel-docs package contains developer documentation for ibus
 
 %prep
 %setup -q
-# %patch0 -p1
+%patch0 -p1
 # ./autogen.sh --help
 
 %build
@@ -228,6 +228,10 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Fri Aug 07 2009 Peng Huang <shawn.p.huang@gmail.com> - 1.2.0.20090807-2
+- Update ibus-HEAD.patch
+- Fix bug 516154.
+
 * Fri Aug 07 2009 Peng Huang <shawn.p.huang@gmail.com> - 1.2.0.20090807-1
 - Update to 1.2.0.20090807