diff --git a/fcitx5.changes b/fcitx5.changes
index 45de83a..37dbe7a 100644
--- a/fcitx5.changes
+++ b/fcitx5.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Oct  7 12:34:18 UTC 2022 - Marguerite Su <i@marguerite.su>
+
+- 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/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