diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec
index 3cb6a6b..71316f7 100644
--- a/rpm_spec/core-vm.spec
+++ b/rpm_spec/core-vm.spec
@@ -179,6 +179,9 @@ install -D u2mfn/libu2mfn.so $RPM_BUILD_ROOT/%{_libdir}/libu2mfn.so
 %triggerin -- initscripts
 cp /usr/lib/qubes/serial.conf /etc/init/serial.conf
 
+%triggerin -- systemd
+mv -f /%{_lib}/security/pam_systemd.so /%{_lib}/security/pam_systemd.so.disabled
+
 %post
 
 # disable some Upstart services
@@ -246,6 +249,12 @@ if ! [ -e /lib/firmware/updates ]; then
   ln -s /lib/modules/firmware /lib/firmware/updates
 fi
 
+# Disable pam_systemd - we (hopefully) don't need it, but it cause some minor
+# problems (http://wiki.qubes-os.org/trac/ticket/607)
+# /etc/pam.d/common-* are automatically (re)generated by authconfig, so its
+# modification will not be persistent -> must be done this way
+mv -f /%{_lib}/security/pam_systemd.so /%{_lib}/security/pam_systemd.so.disabled
+
 if ! grep -q '/etc/yum\.conf\.d/qubes-proxy\.conf'; then
   echo >> /etc/yum.conf
   echo '# Yum does not support inclusion of config dir...' >> /etc/yum.conf
@@ -320,6 +329,7 @@ if [ "$1" = 0 ] ; then
     mv /var/lib/qubes/fstab.orig /etc/fstab
     mv /var/lib/qubes/removed-udev-scripts/* /etc/udev/rules.d/
     mv /var/lib/qubes/serial.orig /etc/init/serial.conf
+    mv /%{_lib}/security/pam_systemd.so.disabled /%{_lib}/security/pam_systemd.so
 fi
 
 %postun