diff --git a/ibus-typing-booster-2.24.2.tar.gz b/ibus-typing-booster-2.24.2.tar.gz
deleted file mode 100644
index f03b2e1..0000000
--- a/ibus-typing-booster-2.24.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c7e5a68e83fd3b9f0a097d4f580f159f8343e96b583ed5ac70dca4aad9bbb3b8
-size 12216471
diff --git a/ibus-typing-booster-2.25.4.tar.gz b/ibus-typing-booster-2.25.4.tar.gz
new file mode 100644
index 0000000..b006cc6
--- /dev/null
+++ b/ibus-typing-booster-2.25.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8781b35a8a61c413595a946f9c0911f0c3bc2ddac11e8f4ed5b81b7aaa3d0155
+size 12388721
diff --git a/ibus-typing-booster-libX11-1.8.7.patch b/ibus-typing-booster-libX11-1.8.7.patch
deleted file mode 100644
index b1eecb3..0000000
--- a/ibus-typing-booster-libX11-1.8.7.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-Index: ibus-typing-booster-2.24.2/tests/test_itb.py
-===================================================================
---- ibus-typing-booster-2.24.2.orig/tests/test_itb.py
-+++ ibus-typing-booster-2.24.2/tests/test_itb.py
-@@ -2367,89 +2367,73 @@ class ItbTestCase(unittest.TestCase):
-             ['en_US'], update_gsettings=False)
-         self.engine.do_process_key_event(IBus.KEY_dead_macron, 0, 0)
-         self.assertEqual(self.engine.mock_preedit_text, '¯')
--        self.engine.do_process_key_event(0x010001EB, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭ')
--        self.engine.do_process_key_event(IBus.KEY_Multi_key, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭ·')
--        self.engine.do_process_key_event(IBus.KEY_macron, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭ¯')
--        self.engine.do_process_key_event(0x010001EB, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭ')
--        self.engine.do_process_key_event(IBus.KEY_Multi_key, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭ·')
--        self.engine.do_process_key_event(IBus.KEY_underscore, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭ_')
--        self.engine.do_process_key_event(0x010001EB, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭ')
--        self.engine.do_process_key_event(IBus.KEY_dead_macron, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭ¯')
-         self.engine.do_process_key_event(IBus.KEY_dead_ogonek, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭ¯˛')
-+        self.assertEqual(self.engine.mock_preedit_text, '¯˛')
-         self.engine.do_process_key_event(IBus.KEY_o, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭ')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭ')
-         self.engine.do_process_key_event(IBus.KEY_dead_macron, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭ¯')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭ¯')
-         self.engine.do_process_key_event(IBus.KEY_Multi_key, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭ¯·')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭ¯·')
-         self.engine.do_process_key_event(IBus.KEY_semicolon, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭ¯·;')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭ¯·;')
-         self.engine.do_process_key_event(IBus.KEY_o, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭ')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭ')
-         self.engine.do_process_key_event(IBus.KEY_Multi_key, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭ·')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭ·')
-         self.engine.do_process_key_event(IBus.KEY_macron, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭ¯')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭ¯')
-         self.engine.do_process_key_event(IBus.KEY_dead_ogonek, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭ¯˛')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭ¯˛')
-         self.engine.do_process_key_event(IBus.KEY_o, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭ')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭ')
-         self.engine.do_process_key_event(IBus.KEY_Multi_key, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭ·')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭ·')
-         self.engine.do_process_key_event(IBus.KEY_macron, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭ¯')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭ¯')
-         self.engine.do_process_key_event(IBus.KEY_semicolon, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭ¯;')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭ¯;')
-         self.engine.do_process_key_event(IBus.KEY_o, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭ')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭ')
-         self.engine.do_process_key_event(IBus.KEY_Multi_key, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭ·')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭ·')
-         self.engine.do_process_key_event(IBus.KEY_underscore, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭ_')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭ_')
-         self.engine.do_process_key_event(IBus.KEY_dead_ogonek, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭ_˛')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭ_˛')
-         self.engine.do_process_key_event(IBus.KEY_o, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭ')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭ')
-         self.engine.do_process_key_event(IBus.KEY_Multi_key, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭ·')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭ·')
-         self.engine.do_process_key_event(IBus.KEY_underscore, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭ_')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭ_')
-         self.engine.do_process_key_event(IBus.KEY_semicolon, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭ_;')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭ_;')
-         self.engine.do_process_key_event(IBus.KEY_o, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭǭ')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭ')
-         self.engine.do_process_key_event(IBus.KEY_dead_caron, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭǭˇ')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭˇ')
-         self.engine.do_process_key_event(IBus.KEY_EZH, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭǭǮ')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǮ')
-         self.engine.do_process_key_event(IBus.KEY_Multi_key, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭǭǮ·')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǮ·')
-         self.engine.do_process_key_event(IBus.KEY_c, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭǭǮc')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǮc')
-         self.engine.do_process_key_event(IBus.KEY_EZH, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭǭǮǮ')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǮǮ')
-         self.engine.do_process_key_event(IBus.KEY_dead_caron, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭǭǮǮˇ')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǮǮˇ')
-         self.engine.do_process_key_event(IBus.KEY_ezh, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭǭǮǮǯ')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǮǮǯ')
-         self.engine.do_process_key_event(IBus.KEY_Multi_key, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭǭǮǮǯ·')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǮǮǯ·')
-         self.engine.do_process_key_event(IBus.KEY_c, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭǭǮǮǯc')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǮǮǯc')
-         self.engine.do_process_key_event(IBus.KEY_ezh, 0, 0)
--        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǭǭǭǮǮǯǯ')
-+        self.assertEqual(self.engine.mock_preedit_text, 'ǭǭǭǭǭǭǮǮǯǯ')
-         self.engine.do_process_key_event(IBus.KEY_space, 0, 0)
-         self.assertEqual(self.engine.mock_preedit_text, '')
--        self.assertEqual(self.engine.mock_committed_text, 'ǭǭǭǭǭǭǭǭǭǮǮǯǯ ')
-+        self.assertEqual(self.engine.mock_committed_text, 'ǭǭǭǭǭǭǮǮǯǯ ')
-         if self._compose_sequences.compose([IBus.KEY_Multi_key, 0x01002276, IBus.KEY_slash]) != '≸':
-             self.skipTest(
-                 'Compose file too old, older than '
-@@ -2462,7 +2446,7 @@ class ItbTestCase(unittest.TestCase):
-         self.assertEqual(self.engine.mock_preedit_text, '≸')
-         self.engine.do_process_key_event(IBus.KEY_space, 0, 0)
-         self.assertEqual(self.engine.mock_preedit_text, '')
--        self.assertEqual(self.engine.mock_committed_text, 'ǭǭǭǭǭǭǭǭǭǮǮǯǯ ≸ ')
-+        self.assertEqual(self.engine.mock_committed_text, 'ǭǭǭǭǭǭǮǮǯǯ ≸ ')
-         self.engine.do_process_key_event(IBus.KEY_Multi_key, 0, 0)
-         self.assertEqual(self.engine.mock_preedit_text, '·')
-         self.engine.do_process_key_event(0x0100093C, 0, 0)
-@@ -2473,7 +2457,7 @@ class ItbTestCase(unittest.TestCase):
-         self.engine.do_process_key_event(IBus.KEY_space, 0, 0)
-         self.assertEqual(self.engine.mock_preedit_text, '')
-         self.assertEqual(self.engine.mock_committed_text,
--                         'ǭǭǭǭǭǭǭǭǭǮǮǯǯ ≸ \u0915\u093C ')
-+                         'ǭǭǭǭǭǭǮǮǯǯ ≸ \u0915\u093C ')
- 
-     def test_compose_combining_chars_in_preedit_representation(self) -> None:
-         self.engine.set_current_imes(
diff --git a/ibus-typing-booster.changes b/ibus-typing-booster.changes
index 2e57bd4..fab805d 100644
--- a/ibus-typing-booster.changes
+++ b/ibus-typing-booster.changes
@@ -1,3 +1,124 @@
+-------------------------------------------------------------------
+Thu Apr 04 15:48:42 UTC 2024 - maiku.fabian@gmail.com
+
+- Update to 2.25.4
+- Pass key which triggered cancel command to application
+  if self._min_char_complete == 0 and there are no candidates
+  (Resolves:  https://github.com/mike-fabian/ibus-typing-booster/issues/505)
+- Update emoji annotations from CLDR
+- Translation update from Weblate (ka 100%)
+
+-------------------------------------------------------------------
+Sat Feb 24 14:47:06 UTC 2024 - maiku.fabian@gmail.com
+
+- Update to 2.25.3
+- Add a feature to insert or remove RLM or LRM markers to
+  change the direction of a line of bidi text
+  (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/500)
+
+-------------------------------------------------------------------
+Tue Feb 13 19:57:18 UTC 2024 - maiku.fabian@gmail.com
+
+- Update to 2.25.1
+- Make it possible to use keys with Unicode keysyms in keybindings
+  (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/497)
+- Add hack to make space handling for punctuation work for kate and kwrite
+  (https://github.com/mike-fabian/ibus-typing-booster/issues/496)
+- Translation update from Weblate (pl 99.5%)
+
+-------------------------------------------------------------------
+Mon Feb 05 16:52:49 UTC 2024 - maiku.fabian@gmail.com
+
+- Update to 2.25.0
+- Add new combobox option “Record mode”
+  (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/470)
+- Improve handling of “:” for fr_CA and add fr_CH to use the same rules as fr_FR
+  (Related: https://github.com/mike-fabian/ibus-typing-booster/issues/480)
+- Translation update from Weblate (bn 100%, de 100%, fr 100%, ja 99%, ka 100%, sv 100%, tr 100%)
+
+-------------------------------------------------------------------
+Sat Jan 27 21:00:05 UTC 2024 - maiku.fabian@gmail.com
+
+- Update to 2.24.12
+- Improve handling of punctuation marks when writing (French) French
+  (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/480)
+
+-------------------------------------------------------------------
+Sat Jan 20 15:15:55 UTC 2024 - Callum Farmer <gmbr3@opensuse.org>
+
+- Fixes for %_ibus_libexecdir moving to %_libexecdir (bsc#1174075)
+
+-------------------------------------------------------------------
+Sat Jan 06 00:53:31 UTC 2024 - maiku.fabian@gmail.com
+
+- Update to 2.24.11
+- Really clear the preedit when it is empty, don’t just hide it
+  (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/476)
+  Just hiding a non-empty preedit is not enough because of
+  IBus.PreeditFocusMode.COMMIT a non-empty preedit is still
+  committed on focus out, even when it is hidden.
+
+-------------------------------------------------------------------
+Fri Dec 29 22:55:34 UTC 2023 - maiku.fabian@gmail.com
+
+- Update to 2.24.9
+- Update the preedit to empty right after deleting surrounding text when reopening a preedit
+  (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/474)
+- Improve do_reset()
+  (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/473)
+  (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/474)
+- Fix _record_in_database_and_push_context()
+- Avoid updating the preedit to empty or  hiding it if the preedit is already hidden or empty
+- Do not pass through a key release event if the corresponding key press event was handled
+- Remove two probably redundant calls to get_surrounding_text()
+- Hide and clear lookup table and aux in _update_ui_empty_input_try_completion() if no candidates are found
+- Make self._ibus_event_sleep_seconds settable via gsettings
+- Avoid more duplicate calls of _update_preedit()
+  (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/473)
+  (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/474)
+- Fix disappearing first characters or words in the web clients of WhatsApp and Telegram used in Firefox
+  (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/473)
+- Update emoji annotations from CLDR
+
+-------------------------------------------------------------------
+Tue Dec 18 18:27:49 UTC 2023 - maiku.fabian@gmail.com
+
+- Update to 2.24.7
+- Hide and clear lookup table and aux in _update_ui_empty_input_try_completion() if no candidates are found
+- Make self._ibus_event_sleep_seconds settable via gsettings
+- Avoid more duplicate calls of _update_preedit()
+  (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/474)
+- Fix disappearing first characters or words in the web clients of WhatsApp and Telegram used in Firefox
+  (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/473)
+- Update emoji annotations from CLDR
+
+-------------------------------------------------------------------
+Tue Dec 05 09:27:18 UTC 2023 - maiku.fabian@gmail.com
+
+- Update to 2.24.5
+- Fix first character disappearing when compose was involved in WhatsApp and Telegram
+  (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/471
+- Update emoji annotations from CLDR
+
+-------------------------------------------------------------------
+Wed Oct 18 16:50:36 UTC 2023 - maiku.fabian@gmail.com
+
+- Update to 2.24.4
+- Fix typos which prevented autosettings from working when the attempting
+  to autoset “avoidforwardkeyevent” or “addspaceoncommit”
+  (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/469)
+
+-------------------------------------------------------------------
+Mon Oct 16 21:40:08 UTC 2023 - maiku.fabian@gmail.com
+
+- Update to 2.24.3
+- Adapt compose test cases to newest compose table
+- Parse compose sequence “<Multi_key> <slash> <slash> : "\\" backslash # REVERSE SOLIDUS”
+  correctly (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/467)
+- Avoid really *all* use of self.foreward_key_event() if the option self._avoid_forward_key_event is True
+- Avoid verbatim bidi formatting characters in the source code
+- Drop ibus-typing-booster-libX11-1.8.7.patch
+
 -------------------------------------------------------------------
 Sun Oct  8 16:26:56 UTC 2023 - Marguerite Su <i@marguerite.su>
 
diff --git a/ibus-typing-booster.spec b/ibus-typing-booster.spec
index 59a68c1..35d9fe4 100644
--- a/ibus-typing-booster.spec
+++ b/ibus-typing-booster.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ibus-typing-booster
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           ibus-typing-booster
-Version:        2.24.2
+Version:        2.25.4
 Release:        0
 Summary:        An input completion utility
 License:        GPL-3.0-or-later
@@ -25,7 +25,6 @@ Group:          System/X11/Utilities
 URL:            https://mike-fabian.github.io/ibus-typing-booster/
 Source0:        https://github.com/mike-fabian/ibus-typing-booster/releases/download/%{version}/%{name}-%{version}.tar.gz
 Source1:        https://releases.pagure.org/inscript2/inscript2-20210820.tar.gz
-Patch0:         %{name}-libX11-1.8.7.patch
 BuildRequires:  AppStream
 BuildRequires:  appstream-glib
 BuildRequires:  dbus-1-x11
@@ -99,11 +98,10 @@ input method to speedup typing.
 ##extract inscript2 maps
 tar xzf %{SOURCE1}
 %endif
-%patch0 -p1
 
 %build
 export PYTHON=%{_bindir}/python3
-%configure --disable-static --libexecdir=%{_libdir}/ibus
+%configure --disable-static --libexecdir=%{_ibus_libexecdir}
 %make_build
 
 %install
@@ -217,8 +215,8 @@ fi
 %{_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
+%{_ibus_libexecdir}/ibus-engine-typing-booster
+%{_ibus_libexecdir}/ibus-setup-typing-booster
 %{_datadir}/applications/*.desktop
 %{_datadir}/glib-2.0/schemas/org.freedesktop.ibus.engine.typing-booster.gschema.xml
 %if 0%{?suse_version} < 1550