diff --git a/ibus.spec b/ibus.spec
index ce36064..cde5fac 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -18,21 +18,34 @@ BuildRequires:	dconf
 BuildRequires:	GConf2
 BuildRequires:	gtk-doc
 BuildRequires:	intltool
+BuildRequires:	kde4-macros
 BuildRequires:	vala
+BuildRequires:	vala-devel
 BuildRequires:	vala-tools
 BuildRequires:	gettext-devel
+BuildRequires:	pkgconfig(dbus-1)
 BuildRequires:	pkgconfig(dbus-glib-1)
 BuildRequires:	pkgconfig(dbus-python)
 BuildRequires:	pkgconfig(dconf)
 BuildRequires:	pkgconfig(gconf-2.0)
+BuildRequires:	pkgconfig(gdk-2.0)
+BuildRequires:	pkgconfig(gdk-3.0)
+BuildRequires:	pkgconfig(gio-2.0) >= 2.32.0
+BuildRequires:	pkgconfig(glib-2.0) >= 2.32.0
+BuildRequires:	pkgconfig(gobject-2.0) >= 2.32.0
 BuildRequires:	pkgconfig(gobject-introspection-1.0)
+BuildRequires:	pkgconfig(gthread-2.0) >= 2.32.0
 BuildRequires:	pkgconfig(gtk+-2.0)
 BuildRequires:	pkgconfig(gtk+-3.0)
 BuildRequires:	pkgconfig(iso-codes)
 BuildRequires:	pkgconfig(libnotify)
 BuildRequires:	pkgconfig(pygobject-2.0)
+BuildRequires:	pkgconfig(pygobject-3.0) >= 3.0.0
 BuildRequires:	pkgconfig(python)
 BuildRequires:	pkgconfig(vapigen)
+BuildRequires:	pkgconfig(x11)
+BuildRequires:	python-gi
+
 Requires:	iso-codes
 Requires:	librsvg
 Requires:	python-gobject >= 2.15
@@ -41,6 +54,7 @@ Requires:	pygtk2.0
 Requires:	python-notify
 Requires:	pyxdg
 Suggests:	%{name}-gtk = %{EVRD}
+Requires:       %{name}-ui
 
 %description
 IBus is a next generation input framework.
@@ -54,8 +68,9 @@ IBus is a next generation input framework.
 %{_libexecdir}/ibus-dconf
 %{_libexecdir}/ibus-gconf
 %{_libexecdir}/ibus-x11
-%{_libexecdir}/ibus-ui-gtk*
+# %{_libexecdir}/ibus-ui-gtk*
 %{_libexecdir}/ibus-engine-simple
+%exclude %{_datadir}/ibus/component/gtkpanel.xml
 %{_datadir}/applications/*.desktop
 %{_datadir}/bash-completion/completions/ibus.bash
 %{_datadir}/GConf/gsettings/ibus.convert
@@ -127,6 +142,8 @@ IBus development package: development libraries, header files, and the like.
 Summary:	IBus gtk module
 Group:		System/Internationalization
 Requires:	%{name} = %{EVRD}
+Requires(post):	gtk+2.0
+Requires(postun): gtk+2.0
 
 %description gtk
 IBus gtk module.
@@ -140,6 +157,8 @@ IBus gtk module.
 Summary:	IBus gtk3 module
 Group:		System/Internationalization
 Requires:	%{name} = %{EVRD}
+Requires(post):	gtk+3.0
+Requires(postun): gtk+3.0
 
 %description gtk3
 IBus gtk module.
@@ -149,6 +168,23 @@ IBus gtk module.
 
 #----------------------------------------------------------------------------
 
+%package    ui-gtk3
+Summary:    GTK+ 3.0 UI for IBus
+Group:      System/Internationalization
+Provides:   ibus-ui
+Requires:   %{name} = %{version}
+Suggests:   %{name}-gtk3 = %{version}
+Conflicts:  ibus < 1.4.99.20121006-2
+
+%description ui-gtk3
+GTK+ 3.0 UI for IBus.
+
+%files ui-gtk3
+%{_libexecdir}/ibus-ui-gtk3
+%{_datadir}/ibus/component/gtkpanel.xml
+
+#----------------------------------------------------------------------------
+
 %prep
 %setup -q
 %apply_patches