diff --git a/.cvsignore b/.cvsignore
index 01cd9ed..c960cf7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ibus-table-1.2.0.20090904.tar.gz
+ibus-table-1.2.0.20090912.tar.gz
diff --git a/ibus-table.spec b/ibus-table.spec
index ce1d29e..ad42b42 100644
--- a/ibus-table.spec
+++ b/ibus-table.spec
@@ -1,5 +1,5 @@
 Name:       ibus-table
-Version:    1.2.0.20090904
+Version:    1.2.0.20090912
 Release:    1%{?dist}
 Summary:    The Table engine for IBus platform
 License:    LGPLv2+
@@ -16,6 +16,14 @@ BuildArch:  noarch
 %description
 The package contains general 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.
+
 %prep
 %setup -q
 
@@ -32,6 +40,10 @@ The package contains general Table engine for IBus platform.
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post additional
+ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/additional/compose.db
+ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/additional/latex.db
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
@@ -40,7 +52,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/%{name}/tables
 %dir %{_datadir}/%{name}/icons
 %dir %{_datadir}/%{name}/data
-%dir %{_datadir}/%{name}/setup
 %{_datadir}/ibus/component/table.xml
 %{_datadir}/pkgconfig/%{name}.pc
 %{_datadir}/%{name}/tables/template.txt
@@ -63,15 +74,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/icons/tc-mode.svg
 %{_datadir}/%{name}/icons/tcb-mode.svg
 %{_datadir}/%{name}/data/pinyin_table.txt.bz2
-%{_datadir}/%{name}/engine/KeyEvent.py
-%{_datadir}/%{name}/engine/KeyEvent.pyc
-%{_datadir}/%{name}/engine/KeyEvent.pyo
-%{_datadir}/%{name}/engine/config.py
-%{_datadir}/%{name}/engine/config.pyc
-%{_datadir}/%{name}/engine/config.pyo
-%{_datadir}/%{name}/engine/editor.py
-%{_datadir}/%{name}/engine/editor.pyc
-%{_datadir}/%{name}/engine/editor.pyo
 %{_datadir}/%{name}/engine/factory.py
 %{_datadir}/%{name}/engine/factory.pyc
 %{_datadir}/%{name}/engine/factory.pyo
@@ -90,19 +92,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/engine/tabsqlitedb.py
 %{_datadir}/%{name}/engine/tabsqlitedb.pyc
 %{_datadir}/%{name}/engine/tabsqlitedb.pyo
-%{_datadir}/%{name}/meter/speedmeter.py
-%{_datadir}/%{name}/meter/speedmeter.pyc
-%{_datadir}/%{name}/meter/speedmeter.pyo
-%{_datadir}/%{name}/setup/main.py
-%{_datadir}/%{name}/setup/main.pyc
-%{_datadir}/%{name}/setup/main.pyo
-%{_datadir}/%{name}/setup/setup.glade
+%{_datadir}/%{name}/engine/speedmeter.py
+%{_datadir}/%{name}/engine/speedmeter.pyc
+%{_datadir}/%{name}/engine/speedmeter.pyo
 %{_bindir}/%{name}-createdb
 %{_libexecdir}/ibus-engine-table
-%{_libexecdir}/ibus-setup-table
-%{_libexecdir}/ibus-table-meter
+
+%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
+* Fri Sep 04 2009 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20090912-1.fc12
+- Upgraded to upstream source.
+
 * Fri Sep 04 2009 Caius 'kaio' Chance <k at kaio.me> - 1.2.0.20090904-1.fc12
 - Updated source with additional tables separated.
 
diff --git a/sources b/sources
index 8bee9ff..efa99f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0ca33287ad0efe0c3a4ef4520c8a2c3d  ibus-table-1.2.0.20090904.tar.gz
+22c3994f665b129adc1db6eabed90fda  ibus-table-1.2.0.20090912.tar.gz