diff --git a/baselibs.conf b/baselibs.conf
index 630c264..685d0d1 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,9 +1,29 @@
 uim
 uim-gtk2
-  supplements "packageand(uim-gtk2:gtk2-<targettype>)"
+  post "%if "%_lib" == "lib64""
+  post "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
+  post "%else"
+  post "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
+  post "%endif"
+  postun "%if "%_lib" == "lib64""
+  postun "<prefix>%{_bindir}/gtk-query-immodules-2.0-64 > <prefix>%{_sysconfdir}/gtk-2.0/gtk64.immodules"
+  postun "%else"
+  postun "<prefix>%{_bindir}/gtk-query-immodules-2.0 > <prefix>%{_sysconfdir}/gtk-2.0/gtk.immodules"
+  postun "%endif"
+  supplements "packageand(uim:gtk2-<targettype>)"
 uim-gtk3
-  supplements "packageand(uim-gtk3:gtk3-<targettype>)"
+  post "%if "%_lib" == "lib64""
+  post "<prefix>%{_bindir}/gtk-query-immodules-3.0-64 --update-cache"
+  post "%else"
+  post "<prefix>%{_bindir}/gtk-query-immodules-3.0 --update-cache"
+  post "%endif"
+  postun "%if "%_lib" == "lib64""
+  postun "<prefix>%{_bindir}/gtk-query-immodules-3.0-64 --update-cache"
+  postun "%else"
+  postun "<prefix>%{_bindir}/gtk-query-immodules-3.0 --update-cache"
+  postun "%endif"
+  supplements "packageand(uim:gtk3-<targettype>)"
 uim-qt
-  supplements "packageand(uim-qt:qt3-<targettype>)"
+  supplements "packageand(uim:qt3-<targettype>)"
 uim-qt4
-  supplements "packageand(uim-qt4:libqt4-<targettype>)"
+  supplements "packageand(uim:libqt4-<targettype>)"
diff --git a/uim.changes b/uim.changes
index 6eba724..24d2652 100644
--- a/uim.changes
+++ b/uim.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug  8 16:33:16 CEST 2011 - tiwai@suse.de
+
+- Fix baselibs.conf to update GTK immodule cache properly for
+  uim-gtk2-32bit and uim-gtk3-32bit packages, too
+
 -------------------------------------------------------------------
 Fri Jul 29 17:36:56 CEST 2011 - tiwai@suse.de