diff --git a/fix-emoji-picker-desktop-file.patch b/fix-emoji-picker-desktop-file.patch
new file mode 100644
index 0000000..2910f04
--- /dev/null
+++ b/fix-emoji-picker-desktop-file.patch
@@ -0,0 +1,13 @@
+diff --git a/engine/emoji-picker.desktop.in.in b/engine/emoji-picker.desktop.in.in
+index 4a8c68b..462bcb6 100644
+--- a/engine/emoji-picker.desktop.in.in
++++ b/engine/emoji-picker.desktop.in.in
+@@ -2,5 +2,8 @@
+ Name=Emoji Picker
+ Comment=An emoji selection tool
+ Exec=${PREFIX}/bin/emoji-picker
++Icon=/usr/share/ibus-typing-booster/icons/ibus-hunspell-table.svg
++Terminal=false
+ Type=Application
+ StartupNotify=true
++Categories=GTK;Utility;
diff --git a/ibus-typing-booster-1.5.21.tar.gz b/ibus-typing-booster-1.5.21.tar.gz
deleted file mode 100644
index ed9216f..0000000
--- a/ibus-typing-booster-1.5.21.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1b1d0f1e6e5dd53f8c48c6978a9e57daaf9f3883b7f621b0b07272c2f55df1eb
-size 4854544
diff --git a/ibus-typing-booster-1.5.22.tar.gz b/ibus-typing-booster-1.5.22.tar.gz
new file mode 100644
index 0000000..81f84c7
--- /dev/null
+++ b/ibus-typing-booster-1.5.22.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c1a1d876c61dd172259024a2fed51337ead09a5924effc131ab2712bec4c7655
+size 4868110
diff --git a/ibus-typing-booster.changes b/ibus-typing-booster.changes
index 1481ee5..b0f2263 100644
--- a/ibus-typing-booster.changes
+++ b/ibus-typing-booster.changes
@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Fri Feb  24 12:57:33 UTC 2017 - maiku.fabian@gmail.com
+
+- Remove "Buildarch: noarch" again
+  (does not build when --libexecdir=%{_prefix}/%{_lib}/ibus is used
+  but that probably has to be used)
+
+-------------------------------------------------------------------
+Wed Feb  22 18:51:20 UTC 2017 - maiku.fabian@gmail.com
+
+- make it noarch
+
+-------------------------------------------------------------------
+Wed Feb  22 11:46:57 UTC 2017 - maiku.fabian@gmail.com
+
+- fix build (thanks to Stefan Dirsch)
+
+-------------------------------------------------------------------
+Wed Feb  22 11:46:57 UTC 2017 - maiku.fabian@gmail.com
+
+- fix emoji-picker desktop file
+
+-------------------------------------------------------------------
+Wed Feb  22 11:04:22 UTC 2017 - maiku.fabian@gmail.com
+
+- update to 1.5.22
+- Update translations from zanata (de, fr, pl, uk updated)
+- Add an emoji-picker
+- Update of en.xml from CLDR’s emoji annotations
+- Fix skipping of the Korean test case when no Korean dictionary can be found
+- Fix invalid xml in typing-booster.appdata.xml
+- add Requires: python3-pyxdg (for the emoji-picker)
+
 -------------------------------------------------------------------
 Wed Feb  08 10:38:20 UTC 2017 - maiku.fabian@gmail.com
 
diff --git a/ibus-typing-booster.spec b/ibus-typing-booster.spec
index 41678a8..b87ac36 100644
--- a/ibus-typing-booster.spec
+++ b/ibus-typing-booster.spec
@@ -17,7 +17,7 @@
 
 %define __python3 /usr/bin/python3
 Name:       ibus-typing-booster
-Version:    1.5.21
+Version:    1.5.22
 Release:    1%{?dist}
 Summary:    A completion input method
 License:    GPL-3.0+
@@ -25,11 +25,13 @@ Group:      System Environment/Libraries
 URL:        https://mike-fabian.github.io/ibus-typing-booster/
 Source0:    https://fedorahosted.org/releases/i/b/ibus-typing-booster/%{name}-%{version}.tar.gz
 Source1:    https://fedorahosted.org/releases/i/n/inscript2/inscript2-20160423.tar.gz
+Patch0:     fix-emoji-picker-desktop-file.patch
 Requires:   ibus >= 1.5.3
 Requires:   m17n-lib
 Requires:   python3 >= 3.3
 Requires:   dbus-1-python3
 Requires:   python3-pyenchant
+Requires:   python3-pyxdg
 # Recommend a reasonably good font which has most of the emoji:
 Recommends: gdouros-symbola-fonts
 BuildRequires:  ibus-devel
@@ -60,6 +62,7 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  python3-gobject
 BuildRequires:  dbus-1-x11
 BuildRequires:  fdupes
+BuildRequires:  update-desktop-files
 
 %description
 Ibus-typing-booster is a context sensitive completion
@@ -67,7 +70,7 @@ input method to speedup typing.
 
 %prep
 %setup -q
-
+%patch0 -p1
 ##extract inscript2 maps
 tar xzf %{SOURCE1}
 
@@ -86,6 +89,8 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/m17n/icons
 cp -p inscript2/IM/* $RPM_BUILD_ROOT%{_datadir}/m17n/
 cp -p inscript2/icons/* $RPM_BUILD_ROOT%{_datadir}/m17n/icons
 
+%suse_update_desktop_file -i -u emoji-picker GTK Utility
+
 %fdupes %{buildroot}/%{_prefix}
 
 %find_lang %{name}
@@ -130,14 +135,15 @@ make check || cat ./tests/test-suite.log
   %{_bindir}/ibus write-cache --system &>/dev/null || :
 
 %files -f %{name}.lang
-%doc AUTHORS COPYING README 
+%doc AUTHORS COPYING README
+%{_bindir}/emoji-picker
 %{_datadir}/%{name}
 %dir %{_datadir}/appdata
 %{_datadir}/appdata/*.appdata.xml
 %{_datadir}/ibus/component/typing-booster.xml
 %{_libdir}/ibus/ibus-engine-typing-booster
 %{_libdir}/ibus/ibus-setup-typing-booster
-%{_datadir}/applications/ibus-setup-typing-booster.desktop
+%{_datadir}/applications/*.desktop
 %dir %{_datadir}/m17n
 %{_datadir}/m17n/*.mim
 %dir %{_datadir}/m17n/icons