diff --git a/.gitignore b/.gitignore
index 6684cc8..374abf1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,4 @@ ibus-table-1.3.0.20100621.tar.gz
 /ibus-table-1.9.18.tar.gz
 /ibus-table-1.9.19.tar.gz
 /ibus-table-1.9.20.tar.gz
+/ibus-table-1.9.21.tar.gz
diff --git a/ibus-table.spec b/ibus-table.spec
index bd6932f..8601c2c 100644
--- a/ibus-table.spec
+++ b/ibus-table.spec
@@ -1,6 +1,6 @@
 Name:       ibus-table
-Version:    1.9.20
-Release:    3%{?dist}
+Version:    1.9.21
+Release:    1%{?dist}
 Summary:    The Table engine for IBus platform
 License:    LGPLv2+
 Group:      System Environment/Libraries
@@ -11,6 +11,12 @@ Requires:       python3 >= 3.3
 BuildRequires:  ibus-devel > 1.3.0
 BuildRequires:  python3-devel
 BuildRequires:  libappstream-glib
+BuildRequires:  ibus-table-chinese-wubi-jidian
+BuildRequires:  ibus-table-chinese-cangjie
+BuildRequires:  ibus-table-chinese-stroke5
+BuildRequires:  ibus-table-code
+BuildRequires:  ibus-table-latin
+BuildRequires:  ibus-table-translit
 
 Obsoletes:   ibus-table-additional < 1.2.0.20100111-5
 
@@ -44,6 +50,33 @@ export PYTHON=%{__python3}
 
 %check
 appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml
+desktop-file-validate \
+    $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup-table.desktop
+pushd engine
+# run doctests
+    python3 table.py
+    python3 it_util.py
+popd
+mkdir -p /tmp/glib-2.0/schemas/
+cp org.freedesktop.ibus.engine.table.gschema.xml \
+   /tmp/glib-2.0/schemas/org.freedesktop.ibus.engine.table.gschema.xml
+glib-compile-schemas /tmp/glib-2.0/schemas #&>/dev/null || :
+export XDG_DATA_DIRS=/tmp
+eval $(dbus-launch --sh-syntax)
+dconf dump /
+dconf write /org/freedesktop/ibus/engine/table/wubi-jidian/chinesemode 1
+dconf write /org/freedesktop/ibus/engine/table/wubi-jidian/spacekeybehavior false
+dconf dump /
+ibus-daemon -drx
+make check || cat ./tests/test-suite.log
+
+%post
+[ -x %{_bindir}/ibus ] && \
+  %{_bindir}/ibus write-cache --system &>/dev/null || :
+
+%postun
+[ -x %{_bindir}/ibus ] && \
+  %{_bindir}/ibus write-cache --system &>/dev/null || :
 
 
 %files -f %{name}.lang
@@ -52,6 +85,7 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdat
 %{_datadir}/metainfo/*.appdata.xml
 %{_datadir}/ibus/component/table.xml
 %{_datadir}/applications/ibus-setup-table.desktop
+%{_datadir}/glib-2.0/schemas/org.freedesktop.ibus.engine.table.gschema.xml
 %{_bindir}/%{name}-createdb
 %{_libexecdir}/ibus-engine-table
 %{_libexecdir}/ibus-setup-table
@@ -61,6 +95,14 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdat
 %{_datadir}/pkgconfig/%{name}.pc
 
 %changelog
+* Wed Aug 29 2018 Mike FABIAN <mfabian@redhat.com> - 1.9.21-1
+- update to 1.9.21
+- Migrate IBusConfig to GSettings.
+  Resolves: https://github.com/mike-fabian/ibus-table/issues/4
+- Add a test suite
+- Add missing tags to ibus-table-createdb.sgml.
+  Resolves: https://github.com/mike-fabian/ibus-table/issues/3
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.20-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index 7c6a109..778f5e7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ibus-table-1.9.20.tar.gz) = 535008344a423a0c3afacf11206912cbc7b27b7a2724cc0f2dc944d0654a02f0b7d6eda397e95542a41b03fa675820531b12e2b0d8f2091ac6083d707a8ac285
+SHA512 (ibus-table-1.9.21.tar.gz) = 354f7e8ece5c23b84251bd0d5ff06d7a368678ade25e340341ef9f85571b440c455d56660c743be97ff6776ff041c4da35079ce090955c5f87b8f3b587e35866