diff --git a/ibus-m17n-xkb-options.patch b/ibus-m17n-xkb-options.patch
index 551f1c8..81e3c9c 100644
--- a/ibus-m17n-xkb-options.patch
+++ b/ibus-m17n-xkb-options.patch
@@ -268,7 +268,7 @@ Index: ibus-m17n-1.3.2/src/engine.c
      ibus_m17n_init_common ();
  }
  
-@@ -299,6 +385,25 @@ ibus_m17n_engine_class_init (IBusM17NEng
+@@ -299,6 +385,27 @@ ibus_m17n_engine_class_init (IBusM17NEng
                        G_CALLBACK(ibus_m17n_config_value_changed),
                        klass);
  
@@ -278,10 +278,12 @@ Index: ibus-m17n-1.3.2/src/engine.c
 +        if (!xkl_config_rec_get_from_server (klass->xkl_config_rec,
 +                                             xkl_engine)) {
 +            g_object_unref (klass->xkl_config_rec);
++	    klass->xkl_config_rec = NULL;
 +            g_warning ("Can't get default keyboard config from the server");
 +        } else if (!parse_xkb_options (klass->xkl_config_rec,
 +                                       engine_config->xkb_options)) {
 +            g_object_unref (klass->xkl_config_rec);
++	    klass->xkl_config_rec = NULL;
 +            g_warning ("Can't parse xkb options %s",
 +                       engine_config->xkb_options);
 +        }
@@ -294,17 +296,7 @@ Index: ibus-m17n-1.3.2/src/engine.c
      klass->im = NULL;
  }
  
-@@ -412,6 +517,9 @@ ibus_m17n_engine_constructor (GType     
-     IBusM17NEngine *m17n;
-     GObjectClass *object_class;
-     IBusM17NEngineClass *klass;
-+#if HAVE_LIBXKLAVIER
-+    GdkDisplay *display;
-+#endif  /* HAVE_LIBXKLAVIER */
- 
-     m17n = (IBusM17NEngine *) G_OBJECT_CLASS (parent_class)->constructor (type,
-                                                        n_construct_params,
-@@ -499,6 +607,11 @@ ibus_m17n_engine_destroy (IBusM17NEngine
+@@ -499,6 +606,11 @@ ibus_m17n_engine_destroy (IBusM17NEngine
          m17n->context = NULL;
      }
  
@@ -316,7 +308,7 @@ Index: ibus-m17n-1.3.2/src/engine.c
      IBUS_OBJECT_CLASS (parent_class)->destroy ((IBusObject *)m17n);
  }
  
-@@ -735,6 +848,19 @@ ibus_m17n_engine_enable (IBusEngine *eng
+@@ -735,6 +847,19 @@ ibus_m17n_engine_enable (IBusEngine *eng
      ibus_engine_get_surrounding_text (engine, &text, &cursor_pos);
      g_object_unref (text);
  #endif  /* HAVE_IBUS_ENGINE_GET_SURROUNDING_TEXT */
@@ -336,7 +328,7 @@ Index: ibus-m17n-1.3.2/src/engine.c
  }
  
  static void
-@@ -744,6 +870,17 @@ ibus_m17n_engine_disable (IBusEngine *en
+@@ -744,6 +869,17 @@ ibus_m17n_engine_disable (IBusEngine *en
  
      ibus_m17n_engine_focus_out (engine);
      parent_class->disable (engine);
diff --git a/ibus-m17n-xx-icon-symbol.patch b/ibus-m17n-xx-icon-symbol.patch
index 43dac05..7b24a5d 100644
--- a/ibus-m17n-xx-icon-symbol.patch
+++ b/ibus-m17n-xx-icon-symbol.patch
@@ -1,15 +1,28 @@
-Patch to embed hotkeys and symbol property in component XML.
+From 432d6f93be857d2544ad19ba67caea22d5843cc5 Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno@unixuser.org>
+Date: Tue, 5 Jul 2011 16:26:49 +0900
+Subject: [PATCH] Supply hotkeys and symbol in engine desc.
+
+---
+ configure.ac          |    3 +
+ m4/.gitignore         |    2 +
+ m4/ibus.m4            |   52 +++++++++
+ src/default.xml.in.in |  284 +++++++++++++++++++++++++++++++++++++++++--------
+ src/m17nutil.c        |   10 ++
+ src/m17nutil.h        |    6 +
+ 6 files changed, 312 insertions(+), 45 deletions(-)
+ create mode 100644 m4/ibus.m4
+
 Index: ibus-m17n-1.3.2/configure.ac
 ===================================================================
 --- ibus-m17n-1.3.2.orig/configure.ac
 +++ ibus-m17n-1.3.2/configure.ac
-@@ -122,6 +122,10 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GET
+@@ -122,6 +122,9 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GET
  AM_GNU_GETTEXT([external])
  AM_GNU_GETTEXT_VERSION(0.16.1)
  
 +# hotkeys in component xml
 +IBUS_WITH_HOTKEYS
-+IBUS_SET_SYMBOL([?])
 +
  
  # OUTPUT files
@@ -75,12 +88,492 @@ Index: ibus-m17n-1.3.2/src/default.xml.in.in
 ===================================================================
 --- ibus-m17n-1.3.2.orig/src/default.xml.in.in
 +++ ibus-m17n-1.3.2/src/default.xml.in.in
-@@ -254,5 +254,7 @@
+@@ -10,97 +10,114 @@
+ 		<name>m17n:as:phonetic</name>
+ 		<rank>2</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>ক</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:bn:inscript*</name>
+ 		<rank>2</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
+ 		<xkb-options>lv3:ralt_switch</xkb-options>
++		<symbol>ক</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:gu:inscript*</name>
+ 		<rank>2</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
+ 		<xkb-options>lv3:ralt_switch</xkb-options>
++		<symbol>ક</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:hi:inscript*</name>
+ 		<rank>2</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
+ 		<xkb-options>lv3:ralt_switch</xkb-options>
++		<symbol>क</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:kn:kgp</name>
+ 		<rank>2</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>ಕ</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:ks:kbd</name>
+ 		<rank>2</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>क</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:mai:inscript*</name>
+ 		<rank>2</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
+ 		<xkb-options>lv3:ralt_switch</xkb-options>
++		<symbol>क</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:ml:inscript*</name>
+ 		<rank>2</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
+ 		<xkb-options>lv3:ralt_switch</xkb-options>
++		<symbol>ക</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:mr:inscript*</name>
+ 		<rank>2</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
+ 		<xkb-options>lv3:ralt_switch</xkb-options>
++		<symbol>क</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:ne:rom</name>
+ 		<rank>2</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol></symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:or:inscript*</name>
+ 		<rank>2</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
+ 		<xkb-options>lv3:ralt_switch</xkb-options>
++		<symbol>କ</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:pa:inscript*</name>
+ 		<rank>2</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
+ 		<xkb-options>lv3:ralt_switch</xkb-options>
++		<symbol>ਕ</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:sa:harvard-kyoto</name>
+ 		<rank>2</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>क</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:sd:inscript*</name>
+ 		<rank>2</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
+ 		<xkb-options>lv3:ralt_switch</xkb-options>
++		<symbol>क</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:si:wijesekera</name>
+ 		<rank>2</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
+ 		<xkb-options>lv3:ralt_switch</xkb-options>
++		<symbol>සි</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:ta:tamil99</name>
+ 		<rank>2</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>க</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:te:inscript*</name>
+ 		<rank>2</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
+ 		<xkb-options>lv3:ralt_switch</xkb-options>
++		<symbol>క</symbol>
+ 	</engine>
+ 	<!-- Samanala should have lower rank than other Sinhala
+ 	     engines since it is the only non-keyboard input method in
+@@ -109,57 +126,14 @@
+ 		<name>m17n:si:samanala</name>
+ 		<rank>0</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>සි</symbol>
+ 	</engine>
+ 	<!-- Chinese and Japanese engines which require preedit decoration. -->
+ 	<engine>
+ 		<name>m17n:ja:anthy</name>
+ 		<rank>0</rank>
+ 		<preedit-highlight>TRUE</preedit-highlight>
+-	</engine>
+-	<engine>
+-		<name>m17n:zh:cangjie</name>
+-		<rank>0</rank>
+-		<preedit-highlight>TRUE</preedit-highlight>
+-	</engine>
+-	<engine>
+-		<name>m17n:zh:py-b5</name>
+-		<rank>0</rank>
+-		<preedit-highlight>TRUE</preedit-highlight>
+-	</engine>
+-	<engine>
+-		<name>m17n:zh:py-gb</name>
+-		<rank>0</rank>
+-		<preedit-highlight>TRUE</preedit-highlight>
+-	</engine>
+-	<engine>
+-		<name>m17n:zh:py</name>
+-		<rank>0</rank>
+-		<preedit-highlight>TRUE</preedit-highlight>
+-	</engine>
+-	<engine>
+-		<name>m17n:zh:quick</name>
+-		<rank>0</rank>
+-		<preedit-highlight>TRUE</preedit-highlight>
+-	</engine>
+-	<engine>
+-		<name>m17n:zh:tonepy-b5</name>
+-		<rank>0</rank>
+-		<preedit-highlight>TRUE</preedit-highlight>
+-	</engine>
+-	<engine>
+-		<name>m17n:zh:tonepy-gb</name>
+-		<rank>0</rank>
+-		<preedit-highlight>TRUE</preedit-highlight>
+-	</engine>
+-	<engine>
+-		<name>m17n:zh:tonepy</name>
+-		<rank>0</rank>
+-		<preedit-highlight>TRUE</preedit-highlight>
+-	</engine>
+-	<engine>
+-		<name>m17n:zh:util</name>
+-		<rank>0</rank>
+-		<preedit-highlight>TRUE</preedit-highlight>
++		<symbol>あ</symbol>
+ 	</engine>
+ 	<!-- Other Indic engines should be selected by default:
+ 	     https://bugzilla.redhat.com/show_bug.cgi?id=640896 -->
+@@ -167,92 +141,312 @@
+ 		<name>m17n:as:*</name>
+ 		<rank>1</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>ক</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:bn:*</name>
+ 		<rank>1</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>ক</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:gu:*</name>
+ 		<rank>1</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>ક</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:hi:*</name>
+ 		<rank>1</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>क</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:kn:*</name>
+ 		<rank>1</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>ಕ</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:ks:*</name>
+ 		<rank>1</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>क</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:mai:*</name>
+ 		<rank>1</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>क</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:ml:*</name>
+ 		<rank>1</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>ക</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:mr:*</name>
+ 		<rank>1</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>क</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:ne:*</name>
+ 		<rank>1</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol></symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:or:*</name>
+ 		<rank>1</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>କ</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:pa:*</name>
+ 		<rank>1</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>ਕ</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:sa:*</name>
+ 		<rank>1</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>क</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:sd:*</name>
+ 		<rank>1</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>क</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:si:*</name>
+ 		<rank>1</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
+ 		<xkb-options>lv3:ralt_switch</xkb-options>
++		<symbol>සි</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:ta:*</name>
+ 		<rank>1</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>க</symbol>
+ 	</engine>
+ 	<engine>
+ 		<name>m17n:te:*</name>
+ 		<rank>1</rank>
+ 		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>క</symbol>
++	</engine>
++	<!-- Tweak symbols: for most maps, their "title" properties
++	     fit in one character width.  However, some of them are
++	     bit longer. -->
++	<engine>
++		<name>m17n:*:kbd</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol></symbol>
++	</engine>
++	<engine>
++		<name>m17n:*:pre</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol></symbol>
++	</engine>
++	<engine>
++		<name>m17n:*:post</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol></symbol>
++	</engine>
++	<engine>
++		<name>m17n:am:sera</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>አ</symbol>
++	</engine>
++	<engine>
++		<name>m17n:bo:*</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>ཀ</symbol>
++	</engine>
++	<engine>
++		<name>m17n:cr:*</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol></symbol>
++	</engine>
++	<engine>
++		<name>m17n:dv:*</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol></symbol>
++	</engine>
++	<engine>
++		<name>m17n:eo:*</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol></symbol>
++	</engine>
++	<engine>
++		<name>m17n:fa:*</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>ف</symbol>
++	</engine>
++	<engine>
++		<name>m17n:fr:*</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol></symbol>
++	</engine>
++	<engine>
++		<name>m17n:ii:*</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol></symbol>
++	</engine>
++	<engine>
++		<name>m17n:iu:*</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol></symbol>
++	</engine>
++	<engine>
++		<name>m17n:kk:*</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>قا</symbol>
++	</engine>
++	<engine>
++		<name>m17n:km:*</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>ក</symbol>
++	</engine>
++	<engine>
++		<name>m17n:lo:*</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>ກ</symbol>
++	</engine>
++	<engine>
++		<name>m17n:nsk:*</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol></symbol>
++	</engine>
++	<engine>
++		<name>m17n:oj:*</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol></symbol>
++	</engine>
++	<engine>
++		<name>m17n:ps:*</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol></symbol>
++	</engine>
++	<engine>
++		<name>m17n:ru:*</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>Я</symbol>
++	</engine>
++	<engine>
++		<name>m17n:sv:*</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol></symbol>
++	</engine>
++	<engine>
++		<name>m17n:syrc:*</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol></symbol>
++	</engine>
++	<engine>
++		<name>m17n:tai:*</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>꫞</symbol>
++	</engine>
++	<engine>
++		<name>m17n:th:*</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>ท</symbol>
++	</engine>
++	<engine>
++		<name>m17n:ur:*</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>خ</symbol>
++	</engine>
++	<engine>
++		<name>m17n:vi:han</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>越</symbol>
++	</engine>
++	<engine>
++		<name>m17n:vi:nom*</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>喃</symbol>
++	</engine>
++	<engine>
++		<name>m17n:vi:*</name>
++		<rank>0</rank>
++		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol>Ắ</symbol>
++	</engine>
++	<engine>
++		<name>m17n:yi:*</name>
++		<rank>0</rank>
++		<preedit-highlight>TRUE</preedit-highlight>
++		<symbol></symbol>
++	</engine>
++	<engine>
++		<name>m17n:zh:bopomofo</name>
++		<rank>0</rank>
++		<preedit-highlight>TRUE</preedit-highlight>
++		<symbol>ㄅ</symbol>
++	</engine>
++	<engine>
++		<name>m17n:zh:cangjie</name>
++		<rank>0</rank>
++		<preedit-highlight>TRUE</preedit-highlight>
++		<symbol>倉</symbol>
++	</engine>
++	<engine>
++		<name>m17n:zh:py*</name>
++		<rank>0</rank>
++		<preedit-highlight>TRUE</preedit-highlight>
++		<symbol>拼</symbol>
++	</engine>
++	<engine>
++		<name>m17n:zh:quick</name>
++		<rank>0</rank>
++		<preedit-highlight>TRUE</preedit-highlight>
++		<symbol>簡</symbol>
++	</engine>
++	<engine>
++		<name>m17n:zh:tonepy*</name>
++		<rank>0</rank>
++		<preedit-highlight>TRUE</preedit-highlight>
++		<symbol>调</symbol>
+ 	</engine>
+ 	<!-- Default for other engines. -->
+ 	<engine>
  		<name>m17n:*</name>
  		<rank>0</rank>
  		<preedit-highlight>FALSE</preedit-highlight>
++		<symbol></symbol>
 +		@IBUS_HOTKEYS_XML@
-+		@IBUS_SYMBOL_XML@
  	</engine>
  </engines>
 Index: ibus-m17n-1.3.2/src/m17nutil.c
diff --git a/ibus-m17n.spec b/ibus-m17n.spec
index aa1103c..fc42c01 100644
--- a/ibus-m17n.spec
+++ b/ibus-m17n.spec
@@ -13,7 +13,7 @@
 
 Name:       ibus-m17n
 Version:    1.3.2
-Release:    7%{?dist}
+Release:    8%{?dist}
 Summary:    The M17N engine for IBus platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -77,6 +77,11 @@ make DESTDIR=${RPM_BUILD_ROOT} install
 %{_datadir}/ibus/component/*
 
 %changelog
+* Fri Aug  5 2011 Daiki Ueno <dueno@redhat.com> - 1.3.2-8
+- Update ibus-m17n-xx-icon-symbol.patch.
+- Fix bug 727024 - ibus compose file needs a symbol tag for gnome-shell
+- Update ibus-m17n-xkb-options.patch.
+
 * Thu Jul  7 2011 Daiki Ueno <dueno@redhat.com> - 1.3.2-7
 - don't specify --with-hotkey.