diff --git a/fcitx.spec b/fcitx.spec
index 350cdde..0446120 100644
--- a/fcitx.spec
+++ b/fcitx.spec
@@ -5,7 +5,7 @@
 Name:			fcitx
 Summary:		Free Chinese Input Toy for X (XIM)
 Version:		4.2.4
-Release:		1%{?dist}
+Release:		2%{?dist}
 License:		GPLv2+
 Group:			User Interface/Desktops
 URL:			http://code.google.com/p/%{name}/
@@ -44,6 +44,8 @@ The %{name}-data package provides shared datas for FCITX.
 %package libs
 Summary:		Shared libraries for FCITX
 Group:			System Environment/Libraries
+Provides:		%{name}-keyboard = %{version}-%{release}
+Obsoletes:		%{name}-keyboard =< 4.2.3
 
 %description libs
 The %{name}-libs package provides shared libraries for FCITX
@@ -62,8 +64,7 @@ developing programs using FCITX libraries.
 Summary:		Chinese table of FCITX
 Group:			System Environment/Libraries
 BuildArch:		noarch
-Requires:		%{name} = %{version}-%{release}
-Requires:		%{name}-data = %{version}-%{release}
+Requires:		%{name}-table = %{version}-%{release}
 
 %description table-chinese
 The %{name}-table-chinese package provides other Chinese table for FCITX.
@@ -101,27 +102,32 @@ Summary:		Pinyin Engine for Fcitx
 Group:			System Environment/Libraries
 Requires:		%{name} = %{version}-%{release}
 Requires:		%{name}-libs = %{version}-%{release}
+Requires:		%{name}-data = %{version}-%{release}
 
 %description pinyin
 This package contains pinyin engine for fcitx.
 
-%package keyboard
-Summary:		X Keyboard integration with Fcitx
+%package qw
+Summary:		Quwei Engine for Fcitx
 Group:			System Environment/Libraries
 Requires:		%{name} = %{version}-%{release}
 Requires:		%{name}-libs = %{version}-%{release}
+Requires:		%{name}-data = %{version}-%{release}
 
-%description keyboard
-Fcitx-keyboard integrates Fcitx into X keyboard, requires X window system.
+%description qw
+This package contains quwei engine for fcitx.
 
-%package qw
-Summary:		Quwei Engine for Fcitx
+%package table
+Summary:		Table Engine for Fcitx
 Group:			System Environment/Libraries
 Requires:		%{name} = %{version}-%{release}
 Requires:		%{name}-libs = %{version}-%{release}
+Requires:		%{name}-data = %{version}-%{release}
+Requires:		%{name}-pinyin = %{version}-%{release}
 
 %description qw
-This package contains quwei engine for fcitx.
+This package contains table engine for fcitx.
+
 
 %prep
 %setup -q
@@ -218,12 +224,11 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 %doc
 %{_bindir}/fcitx4-config
 %{_libdir}/libfcitx*.so.*
-%{_libdir}/%{name}/%{name}-[!pkxq]*.so
-%{_libdir}/%{name}/%{name}-x11.so
-%{_libdir}/%{name}/%{name}-xim.so
+%{_libdir}/%{name}/%{name}-[!pqt]*.so
 %{_libdir}/%{name}/%{name}-punc.so
-%{_libdir}/%{name}/%{name}-kimpanel-ui.so
 %{_libdir}/%{name}/%{name}-quickphrase.so
+%{_libdir}/girepository-1.0/Fcitx-1.0.typelib
+%{_datadir}/gir-1.0/Fcitx-1.0.gir
 
 %files data
 %defattr(-,root,root,-)
@@ -241,16 +246,12 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 %{_datadir}/icons/hicolor/scalable/status/*.svg
 %{_datadir}/icons/gnome/scalable/status/*.svg
 %{_datadir}/%{name}/skin/
-%{_datadir}/%{name}/addon/%{name}-[!pkxq]*.conf
-%{_datadir}/%{name}/addon/%{name}-x11.conf
-%{_datadir}/%{name}/addon/%{name}-xim.conf
+%{_datadir}/%{name}/addon/%{name}-[!pqt]*.conf
 %{_datadir}/%{name}/addon/%{name}-punc.conf
-%{_datadir}/%{name}/addon/%{name}-kimpanel-ui.conf
 %{_datadir}/%{name}/addon/%{name}-quickphrase.conf
 %{_datadir}/%{name}/data/
-%{_datadir}/%{name}/configdesc/[!f]*.desc
-%{_datadir}/%{name}/configdesc/fcitx-[!kpx]*.desc
-%{_datadir}/%{name}/configdesc/fcitx-xim.desc
+%{_datadir}/%{name}/configdesc/[!ft]*.desc
+%{_datadir}/%{name}/configdesc/fcitx-[!p]*.desc
 
 %files devel
 %defattr(-,root,root,-)
@@ -285,17 +286,12 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 %{_libdir}/%{name}/%{name}-qw.so
 %{_datadir}/%{name}/addon/fcitx-qw.conf
 
-%files keyboard
+%files table
 %defattr(-,root,root,-)
 %doc
-%{_datadir}/%{name}/configdesc/fcitx-keyboard.desc
-%{_datadir}/%{name}/configdesc/fcitx-xkb.desc
-%{_libdir}/%{name}/%{name}-keyboard.so
-%{_libdir}/%{name}/%{name}-xkb.so
-%{_libdir}/%{name}/%{name}-xkbdbus.so
-%{_datadir}/%{name}/addon/fcitx-keyboard.conf
-%{_datadir}/%{name}/addon/fcitx-xkb.conf
-%{_datadir}/%{name}/addon/fcitx-xkbdbus.conf
+%{_datadir}/%{name}/configdesc/table.desc
+%{_libdir}/%{name}/%{name}-table.so
+%{_datadir}/%{name}/addon/fcitx-table.conf
 
 %files gtk2
 %defattr(-,root,root,-)
@@ -304,8 +300,6 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 %files gtk3
 %defattr(-,root,root,-)
 %{_libdir}/gtk-3.0/%{gtk3_binary_version}/immodules/im-fcitx.so
-%{_libdir}/girepository-1.0/Fcitx-1.0.typelib
-%{_datadir}/gir-1.0/Fcitx-1.0.gir
 
 %files qt4
 %defattr(-,root,root,-)
@@ -313,6 +307,11 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 
 
 %changelog
+* Thu Jun 07 2012 Liang Suilong <liangsuilong@gmail.com> - 4.2.4-2
+- Drop fcitx-keyboard
+- Divide Table Engine into fcitx-table
+- Move GIR Binding into fcitx-libs
+
 * Tue Jun 05 2012 Liang Suilong <liangsuilong@gmail.com> - 4.2.4-1
 - Upgrade to fcitx-4.2.4
 - Fix the ownership conflict on fcitx and fcitx-data