diff --git a/fcitx5-diagnose-env.patch b/fcitx5-diagnose-env.patch
deleted file mode 100644
index ad60b75..0000000
--- a/fcitx5-diagnose-env.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: fcitx5-5.0.19/data/fcitx5-diagnose.sh
-===================================================================
---- fcitx5-5.0.19.orig/data/fcitx5-diagnose.sh
-+++ fcitx5-5.0.19/data/fcitx5-diagnose.sh
-@@ -1113,18 +1113,18 @@ _env_incorrect() {
- 
- check_xim() {
-     write_title 2 "Xim:"
--    xim_name=fcitx
-+    xim_name=fcitx5
-     write_order_list "$(code_inline '${XMODIFIERS}'):"
-     if [ -z "${XMODIFIERS}" ]; then
-         write_error_eval "$(_ 'XMODIFIERS is not set')"
--        set_env_link XMODIFIERS '@im=fcitx'
-+        set_env_link XMODIFIERS '@im=fcitx5'
-         __need_blank_line=0
--    elif [ "${XMODIFIERS}" = '@im=fcitx' ]; then
--        _env_correct 'XMODIFIERS' '@im=fcitx'
-+    elif [ "${XMODIFIERS}" = '@im=fcitx5' ]; then
-+        _env_correct 'XMODIFIERS' '@im=fcitx5'
-         __need_blank_line=0
-     else
--        _env_incorrect 'XMODIFIERS' '@im=fcitx' "${XMODIFIERS}"
--        set_env_link XMODIFIERS '@im=fcitx'
-+        _env_incorrect 'XMODIFIERS' '@im=fcitx5' "${XMODIFIERS}"
-+        set_env_link XMODIFIERS '@im=fcitx5'
-         if [[ ${XMODIFIERS} =~ @im=([-_0-9a-zA-Z]+) ]]; then
-             xim_name="${BASH_REMATCH[1]}"
-         else
-@@ -1183,11 +1183,11 @@ _check_toolkit_env() {
-         [ -z "${!env_name}" ] || break
-     done
-     if [ -z "${!env_name}" ]; then
--        set_env_link "${env_name}" 'fcitx'
--    elif [ "${!env_name}" = 'fcitx' ]; then
--        _env_correct "${env_name}" 'fcitx'
-+        set_env_link "${env_name}" 'fcitx5'
-+    elif [ "${!env_name}" = 'fcitx5' ]; then
-+        _env_correct "${env_name}" 'fcitx5'
-     else
--        _env_incorrect "${env_name}" 'fcitx' "${!env_name}"
-+        _env_incorrect "${env_name}" 'fcitx5' "${!env_name}"
-         __need_blank_line=0
-         if [ "${!env_name}" = 'xim' ]; then
-             write_error_eval "$(_ 'You are using xim in ${1} programs.')" \
-@@ -1195,14 +1195,14 @@ _check_toolkit_env() {
-             no_xim_link
-         else
-             write_error_eval \
--                "$(_ 'You may have trouble using fcitx in ${1} programs.')" \
-+                "$(_ 'You may have trouble using fcitx5 in ${1} programs.')" \
-                 "${name}"
-             if [ "${!env_name}" = "ibus" ] && [ "${name}" = 'qt' ]; then
-                 __need_blank_line=0
-                 gnome_36_link || __need_blank_line=1
-             fi
-         fi
--        set_env_link "${env_name}" 'fcitx'
-+        set_env_link "${env_name}" 'fcitx5'
-     fi
- }
- 
diff --git a/fcitx5.changes b/fcitx5.changes
index 7779808..37dbe7a 100644
--- a/fcitx5.changes
+++ b/fcitx5.changes
@@ -1,9 +1,8 @@
 -------------------------------------------------------------------
-Tue Oct  4 04:23:27 UTC 2022 - Marguerite Su <i@marguerite.su>
+Fri Oct  7 12:34:18 UTC 2022 - Marguerite Su <i@marguerite.su>
 
-- fix boo#1203579, fcitx5-diagnose requests environment variables
-  to be set to fcitx instead of fcitx5
-- add fcitx5-diagnose-env.patch
+- according to upstream, XMODIFIERS and QT/GTK_IM_MODULE should
+  set to fcitx instead of fcitx5
 
 -------------------------------------------------------------------
 Sat Oct  1 16:26:46 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
diff --git a/fcitx5.spec b/fcitx5.spec
index 7638100..1179737 100644
--- a/fcitx5.spec
+++ b/fcitx5.spec
@@ -38,7 +38,6 @@ Source4:        macros.fcitx5
 Source102:      fcitx5.service
 Patch1:         fcitx5-gcc7.patch
 Patch2:         fcitx5-5.0.13-memfd.patch
-Patch3:         fcitx5-diagnose-env.patch
 BuildRequires:  cmake
 BuildRequires:  dbus-1-devel
 BuildRequires:  extra-cmake-modules
diff --git a/xim.d-fcitx5 b/xim.d-fcitx5
index fb4dfcf..794e08d 100644
--- a/xim.d-fcitx5
+++ b/xim.d-fcitx5
@@ -1,21 +1,12 @@
 #make sure set these vars before dbus-launch
 export LC_CTYPE=$LANG
-export XMODIFIERS="@im=fcitx5"
-export GTK_IM_MODULE=fcitx5
+export XMODIFIERS="@im=fcitx"
+export GTK_IM_MODULE=fcitx
 export QT_IM_SWITCHER=imsw-multi
-export QT_IM_MODULE=fcitx5
+export QT_IM_MODULE=fcitx
 
-case "$WINDOWMANAGER" in
-    *gnome*|*plasma*|*xfce*|*lxde*)
-	# started via xdg autostart (boo#947576)
-	# explicitly set below, as referred in xdg autostart
-	export INPUT_METHOD=fcitx5
-	;;
-    *)
-	# FIXME: a little bit of delay is required to avoid race (boo#947576)
-	(sleep 2; fcitx5 -d) &
-	;;
-esac
+# FIXME: a little bit of delay is required to avoid race (boo#947576)
+(sleep 2; fcitx5 -d) &
 
 # success:
 return 0