diff --git a/ibus-typing-booster-1.5.37.tar.gz b/ibus-typing-booster-1.5.37.tar.gz
deleted file mode 100644
index 60124ab..0000000
--- a/ibus-typing-booster-1.5.37.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:db172bea083315223a3f74c9f032bb89c8e1ba2975bac562d18a4b9360c20912
-size 6410563
diff --git a/ibus-typing-booster-2.0.0.tar.gz b/ibus-typing-booster-2.0.0.tar.gz
new file mode 100644
index 0000000..304ff6c
--- /dev/null
+++ b/ibus-typing-booster-2.0.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:32997bda34b6e52eafa226d83cefbe874bbcdc6618c444b33470525c8b0b053c
+size 5689495
diff --git a/ibus-typing-booster.changes b/ibus-typing-booster.changes
index 9e88782..055b9d1 100644
--- a/ibus-typing-booster.changes
+++ b/ibus-typing-booster.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Mon May 28 22:17:32 UTC 2018 - maiku.fabian@gmail.com
+
+- Update to 2.0.0
+- Update translations because of the merge of the engines (de, pl, uk updated)
+- Update emoji annotations from CLDR
+- Do not hardcode icon names in desktop files
+  (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/17)
+- Change the default for “Unicode symbols and emoji predictions” to “False”
+- Merge all typing-booster engines into one
+- Change the UI of the setup tool to make it possible to select
+  multiple input methods and dictionaries
+- Move the buttons to learn from a file and to delete learned data to the options tab
+- Use the same “About” dialog in the setup tool as in emoji-picker
+
+-------------------------------------------------------------------
+Tue May 22 15:53:44 UTC 2018 - maiku.fabian@gmail.com
+
+- Refresh french translation (thanks to Thierry Thomas)
+- Mark comments in the emoji-picker about dialog as translatable
+
 -------------------------------------------------------------------
 Mon May 14 13:46:19 UTC 2018 - maiku.fabian@gmail.com
 
diff --git a/ibus-typing-booster.spec b/ibus-typing-booster.spec
index 0b2723d..ff77839 100644
--- a/ibus-typing-booster.spec
+++ b/ibus-typing-booster.spec
@@ -15,7 +15,7 @@
 #
 
 Name:           ibus-typing-booster
-Version:        1.5.37
+Version:        2.0.0
 Release:        0 
 Summary:        An input completion utility
 License:        GPL-3.0+
@@ -113,19 +113,18 @@ pushd engine
 popd
 eval $(dbus-launch --sh-syntax)
 dconf dump /
-dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/offtherecord false
-dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/usedigitsasselectkeys true
-dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/tabenable false
-dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/inputmethod "'NoIme'"
-dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/adddirectinput false
-dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/rememberlastusedpreeditime true
-dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/mincharcomplete 1
-dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/dictionary "'en_US'"
-dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/emojipredictions true
-dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/autocommitcharacters "''"
-dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/pagesize 6
-dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/shownumberofcandidates true
-dconf write /desktop/ibus/engine/typing-booster/typing-booster-de-de/showstatusinfoinaux true
+dconf write /desktop/ibus/engine/typing-booster/offtherecord false
+dconf write /desktop/ibus/engine/typing-booster/usedigitsasselectkeys true
+dconf write /desktop/ibus/engine/typing-booster/tabenable false
+dconf write /desktop/ibus/engine/typing-booster/inputmethod "'NoIme'"
+dconf write /desktop/ibus/engine/typing-booster/rememberlastusedpreeditime true
+dconf write /desktop/ibus/engine/typing-booster/mincharcomplete 1
+dconf write /desktop/ibus/engine/typing-booster/dictionary "'en_US'"
+dconf write /desktop/ibus/engine/typing-booster/emojipredictions true
+dconf write /desktop/ibus/engine/typing-booster/autocommitcharacters "''"
+dconf write /desktop/ibus/engine/typing-booster/pagesize 6
+dconf write /desktop/ibus/engine/typing-booster/shownumberofcandidates true
+dconf write /desktop/ibus/engine/typing-booster/showstatusinfoinaux true
 dconf dump /
 ibus-daemon -drx
 make check || cat ./tests/test-suite.log
@@ -145,6 +144,14 @@ make check || cat ./tests/test-suite.log
 %dir %{_datadir}/metainfo
 %{_datadir}/metainfo/*.appdata.xml
 %{_datadir}/ibus/component/typing-booster.xml
+%{_datadir}/icons/hicolor/16x16/apps/ibus-typing-booster.png
+%{_datadir}/icons/hicolor/22x22/apps/ibus-typing-booster.png
+%{_datadir}/icons/hicolor/32x32/apps/ibus-typing-booster.png
+%{_datadir}/icons/hicolor/48x48/apps/ibus-typing-booster.png
+%{_datadir}/icons/hicolor/64x64/apps/ibus-typing-booster.png
+%{_datadir}/icons/hicolor/128x128/apps/ibus-typing-booster.png
+%{_datadir}/icons/hicolor/256x256/apps/ibus-typing-booster.png
+%{_datadir}/icons/hicolor/scalable/apps/ibus-typing-booster.svg
 %{_libdir}/ibus/ibus-engine-typing-booster
 %{_libdir}/ibus/ibus-setup-typing-booster
 %{_datadir}/applications/*.desktop