diff --git a/imsettings-disable-xim.patch b/imsettings-disable-xim.patch
index 6dafcbf..2180321 100644
--- a/imsettings-disable-xim.patch
+++ b/imsettings-disable-xim.patch
@@ -1,19 +1,19 @@
-diff -pruN imsettings-1.6.1.orig/data/imsettings-functions.in imsettings-1.6.1/data/imsettings-functions.in
---- imsettings-1.6.1.orig/data/imsettings-functions.in	2013-04-03 16:26:45.000000000 +0900
-+++ imsettings-1.6.1/data/imsettings-functions.in	2013-04-03 19:20:35.000000000 +0900
-@@ -160,10 +160,11 @@ function is_qt_supported() {
+diff -pruN imsettings-1.8.4.orig/data/imsettings-functions.in imsettings-1.8.4/data/imsettings-functions.in
+--- imsettings-1.8.4.orig/data/imsettings-functions.in	2023-08-21 18:18:38.000000000 +0900
++++ imsettings-1.8.4/data/imsettings-functions.in	2023-08-22 12:45:23.717932630 +0900
+@@ -177,10 +177,11 @@ function is_qt_supported() {
  }
  
  function is_xim_supported() {
--    [ -n "$IMSETTINGS_DISABLE_DESKTOP_CHECK" ] && return 0
--    if check_imsettings_capability xim; then
--	return 0
--    fi
-+# XXX: Disable XIM support so far
-+#    [ -n "$IMSETTINGS_DISABLE_DESKTOP_CHECK" ] && return 0
-+#    if check_imsettings_capability xim; then
-+#	return 0
-+#    fi
+-  [ -n "$IMSETTINGS_DISABLE_DESKTOP_CHECK" ] && return 0
+-  if check_imsettings_capability xim; then
+-    return 0
+-  fi
++## Disable XIM support
++#  [ -n "$IMSETTINGS_DISABLE_DESKTOP_CHECK" ] && return 0
++#  if check_imsettings_capability xim; then
++#    return 0
++#  fi
  
-     return 1
+   return 1
  }
diff --git a/imsettings-fix-infinite-loop-of-restarting.patch b/imsettings-fix-infinite-loop-of-restarting.patch
deleted file mode 100644
index 7105187..0000000
--- a/imsettings-fix-infinite-loop-of-restarting.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0c5dc9a8d8791b1c0df6d22d7e072b9c78d2b8d3 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Fri, 5 Aug 2022 21:31:58 +0900
-Subject: [PATCH] Fix too early threshold for detecting the loop of process
- restarting
-
----
- imsettings-daemon/imsettings-proc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/imsettings-daemon/imsettings-proc.c b/imsettings-daemon/imsettings-proc.c
-index 7eedb0d..f163c5e 100644
---- a/imsettings-daemon/imsettings-proc.c
-+++ b/imsettings-daemon/imsettings-proc.c
-@@ -193,7 +193,7 @@ _watch_im_status_cb(GPid     pid,
- 		gchar *title = g_strdup(_("Unable to keep Input Method running"));
- 
- 		current = g_date_time_new_now_local();
--		if (g_date_time_difference(current, pinfo->started_time) > RESTART_COUNTER_THRESHOLD) {
-+		if (g_date_time_difference(current, pinfo->started_time) > RESTART_COUNTER_THRESHOLD * G_TIME_SPAN_SECOND) {
- 			pinfo->restart_counter = 0;
- 		} else {
- 			pinfo->restart_counter++;
--- 
-2.37.1
-
diff --git a/imsettings.spec b/imsettings.spec
index 30fd855..45a0c83 100644
--- a/imsettings.spec
+++ b/imsettings.spec
@@ -1,6 +1,6 @@
 Name:		imsettings
-Version:	1.8.3
-Release:	10%{?dist}
+Version:	1.8.4
+Release:	1%{?dist}
 License:	LGPL-2.0-or-later
 URL:		https://gitlab.com/tagoh/%{name}/
 BuildRequires:	desktop-file-utils
@@ -23,8 +23,6 @@ Patch2:		%{name}-xinput-xcompose.patch
 %if 0%{?rhel}
 Patch4:		%{name}-glib.patch
 %endif
-Patch5:		%{name}-fix-infinite-loop-of-restarting.patch
-Patch6:		%{name}-disable-gnome.patch
 ## Fedora specific: Force enable the IM management on imsettings for Cinnamon
 Patch7:		%{name}-force-enable-for-cinnamon.patch
 
@@ -340,6 +338,11 @@ fi
 %endif
 
 %changelog
+* Tue Aug 22 2023 Akira TAGOH <tagoh@redhat.com> - 1.8.4-1
+- New upstream release.
+- Add IMSETTINGS_IGNORE_SESSION to not take any actions for certain desktops.
+  Resolves: rhbz#2232064
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index b044acc..d2dad48 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (imsettings-1.8.3.tar.bz2) = 58ebdf9abbff701ce5f069d6b39707d173a68f28f9bac3b5afd40ed6681fa1b816a2d642f2d70efaacb5b1e1017d264f5ef03ede57e56ad12bdf45698b65b723
+SHA512 (imsettings-1.8.4.tar.bz2) = 05bfa1c6df2fbb819d2821c802bad4c3e60f9b3f119898b5b0ca434105cc29dc6a2f48759d49259b86585407d492f88f38733a5570f1d24a6d53052b49b07463