diff --git a/.cvsignore b/.cvsignore
index c960cf7..f16cd58 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ibus-table-1.2.0.20090912.tar.gz
+ibus-table-1.2.0.20100111.tar.gz
diff --git a/ibus-table.spec b/ibus-table.spec
index e4ae19b..c0e709b 100644
--- a/ibus-table.spec
+++ b/ibus-table.spec
@@ -1,12 +1,13 @@
 Name:       ibus-table
-Version:    1.2.0.20090912
-Release:    3%{?dist}
+Version:    1.2.0.20100111
+Release:    1%{?dist}
 Summary:    The Table engine for IBus platform
 License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
-Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:     ibus-table-1.2.0.20090912-1.disable_speedmeter.patch
+Source0:    http://cloud.github.com/downloads/kaio/ibus-table/%{name}-%{version}.tar.gz
+
+#Patch0:     ibus-table-1.2.0.20090912-1.disable_speedmeter.patch
 Patch1:     ibus-table-1.2.0.20090904-2.equalsign.patch
 
 Requires:       ibus > 1.2.0
@@ -16,19 +17,19 @@ BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 
 %description
-The package contains general Table engine for IBus platform.
+The Table engine for IBus platform.
 
-%package additional
-Summary:    Additional tables for general table engine of IBus.
-Group:      System Environment/Libraries
-Requires:   %{name} = %{version}-%{release}
-
-%description additional
-This package contains additional tables.
+#%package additional
+#Summary:    Additional tables for general table engine of IBus.
+#Group:      System Environment/Libraries
+#Requires:   %{name} = %{version}-%{release}
+#
+#%description additional
+#Additional tables for IBus-Table.
 
 %prep
 %setup -q
-%patch0 -p1 -b .1-disable_speedmeter
+#%patch0 -p1 -b .1-disable_speedmeter
 %patch1 -p1 -b .2-equalsign
 
 %build
@@ -38,15 +39,19 @@ This package contains additional tables.
 %install
 %__rm -rf $RPM_BUILD_ROOT
 %__make DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true install pkgconfigdir=%{_datadir}/pkgconfig
+for file in tables/compose.db tables/latex.db icons/compose.svg icons/latex.svg
+do
+    %__rm ${RPM_BUILD_ROOT}%{_datadir}/ibus-table/$file
+done
 
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%__rm -rf $RPM_BUILD_ROOT
 
-%post additional
-ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/compose.db
-ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/latex.db
+#%post additional
+#ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/compose.db
+#ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/latex.db
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -96,20 +101,24 @@ ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/latex.db
 %{_datadir}/%{name}/engine/tabsqlitedb.py
 %{_datadir}/%{name}/engine/tabsqlitedb.pyc
 %{_datadir}/%{name}/engine/tabsqlitedb.pyo
-%{_datadir}/%{name}/engine/speedmeter.py
-%{_datadir}/%{name}/engine/speedmeter.pyc
-%{_datadir}/%{name}/engine/speedmeter.pyo
+#%{_datadir}/%{name}/engine/speedmeter.py
+#%{_datadir}/%{name}/engine/speedmeter.pyc
+#%{_datadir}/%{name}/engine/speedmeter.pyo
 %{_bindir}/%{name}-createdb
 %{_libexecdir}/ibus-engine-table
 
-%files additional
-%defattr(-,root,root,-)
-%{_datadir}/ibus-table/tables/compose.db
-%{_datadir}/ibus-table/tables/latex.db
-%{_datadir}/ibus-table/icons/compose.svg
-%{_datadir}/ibus-table/icons/latex.svg
+#%files additional
+#%defattr(-,root,root,-)
+#%{_datadir}/ibus-table/tables/compose.db
+#%{_datadir}/ibus-table/tables/latex.db
+#%{_datadir}/ibus-table/icons/compose.svg
+#%{_datadir}/ibus-table/icons/latex.svg
 
 %changelog
+* Mon Jan 11 2010 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20100111-1.fc13
+- Updated source from upstream.
+- Migreate tables from ibus-table-additional to ibus-table-latin and ibus-table-code.
+
 * Wed Jan 06 2010 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20090912-3.fc13
 - Apply parsing equal sign patch.
 
diff --git a/sources b/sources
index efa99f0..721dd2c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-22c3994f665b129adc1db6eabed90fda  ibus-table-1.2.0.20090912.tar.gz
+e8ad50fe32f309eec7880cc4b27902e8  ibus-table-1.2.0.20100111.tar.gz