diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index d9b575a..228825e 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -1,3 +1,39 @@
+diff --git a/bus/inputcontext.c b/bus/inputcontext.c
+index acb465d..ca95d65 100644
+--- a/bus/inputcontext.c
++++ b/bus/inputcontext.c
+@@ -656,21 +656,24 @@ _ic_process_key_event_reply_cb (gpointer data,
+ {
+     gboolean retval;
+     CallData *call_data;
+-    IBusMessage *reply;
+ 
+     retval = (gboolean) GPOINTER_TO_INT (data);
+     call_data = (CallData *) user_data;
+ 
+-    reply = ibus_message_new_method_return (call_data->message);
+-    ibus_message_append_args (reply,
+-                              G_TYPE_BOOLEAN, &retval,
+-                              G_TYPE_INVALID);
++    /* make sure the connection is alive */
++    if (G_LIKELY (call_data->context->connection != NULL)) {
++        IBusMessage *reply;
++        reply = ibus_message_new_method_return (call_data->message);
++        ibus_message_append_args (reply,
++                                  G_TYPE_BOOLEAN, &retval,
++                                  G_TYPE_INVALID);
+ 
+-    ibus_connection_send ((IBusConnection *)call_data->context->connection, reply);
++        ibus_connection_send ((IBusConnection *)call_data->context->connection, reply);
++        ibus_message_unref (reply);
++    }
+ 
+     g_object_unref (call_data->context);
+     ibus_message_unref (call_data->message);
+-    ibus_message_unref (reply);
+     g_slice_free (CallData, call_data);
+ }
+ 
 diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
 index 11b0c2f..1db51e1 100644
 --- a/data/ibus.schemas.in
@@ -5248,6 +5284,48 @@ index c367f14..494f7a3 100644
       *
       * Emitted when a property is hidden.
       * Implement the member function property_hide() in extended class to receive this signal.
+diff --git a/src/ibusshare.c b/src/ibusshare.c
+index f66a2d3..194b510 100644
+--- a/src/ibusshare.c
++++ b/src/ibusshare.c
+@@ -281,7 +281,6 @@ ibus_free_strv (gchar **strv)
+     g_free (strv);
+ }
+ 
+-
+ void
+ ibus_init (void)
+ {
+diff --git a/src/ibusshare.h b/src/ibusshare.h
+index 26677a3..c33a372 100644
+--- a/src/ibusshare.h
++++ b/src/ibusshare.h
+@@ -258,8 +258,11 @@ guint            ibus_keyval_from_name  (const gchar    *keyval_name);
+  * @strv: List of strings.
+  *
+  * Free a list of strings.
++ * Deprecated: This function has been deprecated and should
++ * not be used in newly written code.
+  */
+-void             ibus_free_strv         (gchar          **strv);
++void             ibus_free_strv         (gchar          **strv)
++    G_GNUC_DEPRECATED;
+ 
+ /**
+  * ibus_key_event_to_string:
+diff --git a/src/ibustypes.h b/src/ibustypes.h
+index 100eafa..583b534 100644
+--- a/src/ibustypes.h
++++ b/src/ibustypes.h
+@@ -87,7 +87,7 @@ typedef enum
+ 
+     IBUS_RELEASE_MASK  = 1 << 30,
+ 
+-    IBUS_MODIFIER_MASK = 0x5c001fff
++    IBUS_MODIFIER_MASK = 0x5f001fff
+ } IBusModifierType;
+ 
+ /**
 diff --git a/ui/gtk/languagebar.py b/ui/gtk/languagebar.py
 index 0eea1fa..f22080f 100644
 --- a/ui/gtk/languagebar.py
diff --git a/ibus.spec b/ibus.spec
index 0955b34..25b311c 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -8,7 +8,7 @@
 
 Name:       ibus
 Version:    1.3.2
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Intelligent Input Bus for Linux OS
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -218,6 +218,10 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Sun May 02 2010 Peng Huang <shawn.p.huang@gmail.com> - 1.3.2-3
+- Embedded language bar in menu by default.
+- Fix bug 587353 - [abrt] crash in ibus-1.3.2-2.fc12
+
 * Sat Apr 24 2010 Peng Huang <shawn.p.huang@gmail.com> - 1.3.2-2
 - Add requires librsvg2
 - Update ibus-HEAD.patch: Update po files and and setting