diff --git a/debian/security-misc.links b/debian/security-misc.links
new file mode 100644
index 0000000..97e2e5a
--- /dev/null
+++ b/debian/security-misc.links
@@ -0,0 +1,2 @@
+/etc/profile.d/security-misc.sh /etc/zprofile.d/security-misc.sh
+/etc/profile.d/security-misc.sh /etc/X11/Xsession.d/security-misc.sh
diff --git a/debian/security-misc.maintscript b/debian/security-misc.maintscript
index 4be0d9a..177005f 100644
--- a/debian/security-misc.maintscript
+++ b/debian/security-misc.maintscript
@@ -40,3 +40,6 @@ rm_conffile /etc/security/limits.d/disable-coredumps.conf
 
 ## moved to separate package ram-wipe
 rm_conffile /etc/default/grub.d/40_cold_boot_attack_defense.cfg
+
+rm_conffile /etc/X11/Xsession.d/50panic_on_oops
+rm_conffile /etc/X11/Xsession.d/50security-misc
diff --git a/etc/X11/Xsession.d/50security-misc b/etc/X11/Xsession.d/50security-misc
deleted file mode 100755
index 0d8efce..0000000
--- a/etc/X11/Xsession.d/50security-misc
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-## Copyright (C) 2012 - 2023 ENCRYPTED SUPPORT LP <adrelanos@whonix.org>
-## See the file COPYING for copying conditions.
-
-if [ -z "$XDG_CONFIG_DIRS" ]; then
-   XDG_CONFIG_DIRS=/etc/xdg
-fi
-export XDG_CONFIG_DIRS=/usr/share/security-misc/:$XDG_CONFIG_DIRS
diff --git a/etc/X11/Xsession.d/50panic_on_oops b/etc/profile.d/security-misc.sh
similarity index 66%
rename from etc/X11/Xsession.d/50panic_on_oops
rename to etc/profile.d/security-misc.sh
index 79646cb..51ba00e 100755
--- a/etc/X11/Xsession.d/50panic_on_oops
+++ b/etc/profile.d/security-misc.sh
@@ -3,6 +3,11 @@
 ## Copyright (C) 2019 - 2023 ENCRYPTED SUPPORT LP <adrelanos@whonix.org>
 ## See the file COPYING for copying conditions.
 
+if [ -z "$XDG_CONFIG_DIRS" ]; then
+   XDG_CONFIG_DIRS=/etc/xdg
+fi
+export XDG_CONFIG_DIRS=/usr/share/security-misc/:$XDG_CONFIG_DIRS
+
 if [ -x /usr/libexec/security-misc/panic-on-oops ]; then
    sudo --non-interactive /usr/libexec/security-misc/panic-on-oops
 fi