diff --git a/fcitx.spec b/fcitx.spec
index 3a7bb04..a28c586 100644
--- a/fcitx.spec
+++ b/fcitx.spec
@@ -3,7 +3,7 @@
 Name:			fcitx
 Summary:		Free Chinese Input Toy for X (XIM)
 Version:		4.0.1
-Release:		3%{?dist}
+Release:		4%{?dist}
 License:		GPLv2+
 Group:			User Interface/Desktops
 URL:			http://code.google.com/p/%{name}/
@@ -15,22 +15,23 @@ Patch1:			gnome3-mainwindow-pos-walkaround.patch
 BuildRequires:		pango-devel dbus-devel
 BuildRequires:		wget intltool chrpath sysconftool
 BuildRequires:		automake, autoconf, libtool
-Requires:		%{name}-libs = %{version}-%{release}
-Requires:		imsettings
+Requires:		%{name}-data = %{version}-%{release}
+Requires:		imsettings 
 Requires(post):	%{_sbindir}/alternatives
 Requires(postun):	%{_sbindir}/alternatives
+Provides:		%{name}-libs = = %{version}-%{release}
 
 %description
 FCITX(Free Chinese Input Toy of X) is a collection of Simplified Chinese 
 input methods for Linux. It supports Pinyin, QuWei and Table-based input 
 methods. It's small and fast.
 
-%package libs
-Summary:		Libraries for FCITX
+%package data
+Summary:		Data files of FCITX
 Group:			System Environment/Libraries
 
-%description libs
-The %{name}-libs package provides shared libraries for FCITX.
+%description data
+The %{name}-data package provides shared libraries for FCITX.
 
 %package devel
 Summary:		Development files for FCITX
@@ -42,6 +43,70 @@ Requires:		libX11-devel
 The %{name}-devel package contains libraries and header files necessary for
 developing programs using FCITX libraries.
 
+%package table-bingchan
+Summary:		Bingchan table of FCITX
+Group:			System Environment/Libraries
+BuildArch:		noarch
+
+%description table-bingchan
+The %{name}-table-bingchan package provides Bingchan table for FCITX.
+
+%package table-cangjie
+Summary:		Cangjie table of FCITX
+Group:			System Environment/Libraries
+BuildArch:		noarch
+
+%description table-cangjie
+The %{name}-table-bingchan package provides Cangjie table for FCITX.
+
+%package table-dianbaoma
+Summary:		Dianbaoma table of FCITX
+Group:			System Environment/Libraries
+BuildArch:		noarch
+
+%description table-dianbaoma
+The %{name}-table-dianbaoma package provides Dianbaoma table for FCITX.
+
+%package table-erbi
+Summary:		Erbi table of FCITX
+Group:			System Environment/Libraries
+BuildArch:		noarch
+
+%description table-erbi
+The %{name}-table-erbi package provides Erbi table for FCITX.
+
+%package table-wanfeng
+Summary:		Wanfeng table of FCITX
+Group:			System Environment/Libraries
+BuildArch:		noarch
+
+%description table-wanfeng
+The %{name}-table-wanfeng package provides Wanfeng table for FCITX.
+
+%package table-wbpy
+Summary:		Wubi-pinyin table of FCITX
+Group:			System Environment/Libraries
+BuildArch:		noarch
+
+%description table-wbpy
+The %{name}-table-wbpy package provides Wubi-pinyin table for FCITX.
+
+%package table-wubi
+Summary:		Wubi table of FCITX
+Group:			System Environment/Libraries
+BuildArch:		noarch
+
+%description table-wubi
+The %{name}-table-wubi package provides Wubi table for FCITX.
+
+%package table-ziranma
+Summary:		Ziranma table of FCITX
+Group:			System Environment/Libraries
+BuildArch:		noarch
+
+%description table-ziranma
+The %{name}-table-ziranma package provides Ziranma table for FCITX.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -91,15 +156,14 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog THANKS TODO 
+%doc AUTHORS ChangeLog THANKS TODO COPYING
 #%doc __doc/*
 %config %{_xinputconf}
 %{_bindir}/*
-%{_datadir}/%{name}
-%{_datadir}/pixmaps/*
 %{_datadir}/applications/%{name}-configtool.desktop
 %{_datadir}/applications/%{name}.desktop
 %{_docdir}/%{name}/
+%{_libdir}/libfcitx*.so.*
 %{_mandir}/man1/createPYMB.1.gz
 %{_mandir}/man1/fcitx-remote.1.gz
 %{_mandir}/man1/fcitx.1.gz
@@ -111,10 +175,27 @@ fi
 %{_mandir}/man1/txt2mb.1.gz
 
 
-%files libs
+%files data
 %defattr(-,root,root,-)
-%doc COPYING
-%{_libdir}/libfcitx*.so.*
+%doc 
+%{_datadir}/%{name}/skin/*
+%{_datadir}/pixmaps/*
+%{_datadir}/%{name}/data/AutoEng.dat
+%{_datadir}/%{name}/data/addon.desc
+%{_datadir}/%{name}/data/config.desc
+%{_datadir}/%{name}/data/gbks2t.tab
+%{_datadir}/%{name}/data/profile.desc
+%{_datadir}/%{name}/data/punc.mb
+%{_datadir}/%{name}/data/pySym.mb
+%{_datadir}/%{name}/data/pybase.mb
+%{_datadir}/%{name}/data/pyphrase.mb
+%{_datadir}/%{name}/data/skin.desc
+%{_datadir}/%{name}/data/sp.dat
+%{_datadir}/%{name}/data/table.desc
+%{_datadir}/%{name}/data/table/disable-table.conf.template
+%{_datadir}/%{name}/data/vk.conf
+
+
 
 %files devel
 %defattr(-,root,root,-)
@@ -123,7 +204,53 @@ fi
 %{_libdir}/pkgconfig/fcitx*.pc
 %{_includedir}/fcitx*
 
+%files table-bingchan
+%defattr(-,root,root,-)
+%doc
+%{_datadir}/%{name}/data/qxm.conf
+%{_datadir}/%{name}/data/qxm.mb
+
+%files table-cangjie
+%defattr(-,root,root,-)
+%doc
+%{_datadir}/%{name}/data/cangjie.conf
+%{_datadir}/%{name}/data/cj.mb
+
+%files table-erbi
+%defattr(-,root,root,-)
+%doc
+%{_datadir}/%{name}/data/erbi.conf
+%{_datadir}/%{name}/data/erbi.mb
+
+%files table-wanfeng
+%defattr(-,root,root,-)
+%doc
+%{_datadir}/%{name}/data/wanfeng.conf
+%{_datadir}/%{name}/data/wanfeng.mb
+
+%files table-wbpy
+%defattr(-,root,root,-)
+%doc
+%{_datadir}/%{name}/data/wbpy.conf
+%{_datadir}/%{name}/data/wbpy.mb
+
+%files table-wubi
+%defattr(-,root,root,-)
+%doc
+%{_datadir}/%{name}/data/wubi.conf
+%{_datadir}/%{name}/data/wubi.mb
+
+%files table-ziranma
+%defattr(-,root,root,-)
+%doc
+%{_datadir}/%{name}/data/zrm.conf
+%{_datadir}/%{name}/data/zrm.mb
+
 %changelog
+* Tue Aug 02 2011 Liang Suilong <liangsuilong@gmail.com> - 4.0.1-4
+- Separates varieties of tables from FCITX
+- Merge fcitx-libs into fcitx 
+
 * Sun Jul 03 2011 Liang Suilong <liangsuilong@gmail.com> - 4.0.1-3
 - Support GNOME 3 tray icon
 - Fix that main window is covered by GNOME Shell