diff --git a/uim.changes b/uim.changes
index 880e318..e8fedd6 100644
--- a/uim.changes
+++ b/uim.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue May 31 16:23:54 UTC 2011 - dimstar@opensuse.org
+
+- Introduce a build_applet define, which is set to 1 on openSUSE up
+  to 11.4. For current Factory, we need to disable the applet, as
+  it is not (yet) ported to the new libpanelapplet-4.0
+  infrastructure of Gnome3.
+- Move the gnome applet actually to the gtk package (when building
+  the applet).
+
 -------------------------------------------------------------------
 Wed Mar  9 12:29:07 CET 2011 - tiwai@suse.de
 
diff --git a/uim.spec b/uim.spec
index 55f19aa..585778a 100644
--- a/uim.spec
+++ b/uim.spec
@@ -15,7 +15,8 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
+# The applet does not work currently on Factory, as it has not been ported to libpanelapplet-4.0 yet.
+%define build_applet 0%{?suse_version} <= 1140
 
 Name:           uim
 BuildRequires:  anthy-devel
@@ -23,7 +24,6 @@ BuildRequires:  canna-devel
 BuildRequires:  emacs-x11
 BuildRequires:  emacs-x11
 BuildRequires:  gcc-c++
-BuildRequires:  gnome-panel-devel
 BuildRequires:  intltool
 BuildRequires:  libexpat-devel
 BuildRequires:  libgnomeui-devel
@@ -36,6 +36,9 @@ BuildRequires:  pkgconfig(gtk+-2.0)
 %else
 BuildRequires:  gtk2-devel
 %endif
+%if %{?build_applet}
+BuildRequires:  gnome-panel-devel
+%endif
 BuildRequires:  qt3-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  xemacs
@@ -242,7 +245,6 @@ uim-module-manager --register pyload anthy anthy-utf8 canna skk tcode tutcode ha
 %dir %{_prefix}/lib/uim
 %endif
 %{_prefix}/lib/uim/uim-helper-server
-%{_prefix}/lib/uim/uim-toolbar-applet
 %{_prefix}/lib/uim/uim-candwin-gtk
 %dir %{_libdir}/uim/plugin/
 %{_libdir}/uim/plugin/*.so
@@ -267,7 +269,10 @@ uim-module-manager --register pyload anthy anthy-utf8 canna skk tcode tutcode ha
 %{_bindir}/uim-toolbar-gtk
 %{_bindir}/uim-toolbar-gtk-systray
 %{_bindir}/uim-pref-gtk
+%if %{build_applet}
+%{_prefix}/lib/uim/uim-toolbar-applet
 %{_libdir}/bonobo/servers/*.server
+%endif
 %{_libdir}/gtk-*/*/immodules/*.so
 
 %files -n uim-qt -f uim-chardict-qt.lang