diff --git a/dom0-updates/qubes-dom0-updates.cron b/dom0-updates/qubes-dom0-updates.cron
index b30a0b4..1fba015 100755
--- a/dom0-updates/qubes-dom0-updates.cron
+++ b/dom0-updates/qubes-dom0-updates.cron
@@ -31,10 +31,10 @@ fi
 touch $UPDATES_STAT_FILE
 
 # Notify about updates using system tray
-zenity --notification --window-icon=$NOTIFY_ICON --text="Qubes dom0 updates available."
+su -c 'DISPLAY=:0 zenity --notification --window-icon=$NOTIFY_ICON --text="Qubes dom0 updates available."' $LOCAL_USER
 
-zenity --question --title="Qubes Dom0 updates" \
-      --text="There are updates for dom0 available, do you want to download them now?" || exit 0
+su -c 'DISPLAY=:0 zenity --question --title="Qubes Dom0 updates" \
+      --text="There are updates for dom0 available, do you want to download them now?"' $LOCAL_USER || exit 0
 
 su -c "DISPLAY=:0 qubes-dom0-update --gui" $LOCAL_USER
 
diff --git a/pm-utils/qubes-suspend.service b/pm-utils/qubes-suspend.service
new file mode 100644
index 0000000..010bcf9
--- /dev/null
+++ b/pm-utils/qubes-suspend.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Qubes suspend hooks
+Before=sleep.target
+StopWhenUnneeded=yes
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+StandardOutput=syslog
+ExecStartPre=/usr/lib64/pm-utils/sleep.d/51qubes-suspend-netvm suspend suspend
+ExecStart=/usr/lib64/pm-utils/sleep.d/52qubes-pause-vms suspend suspend
+ExecStop=/usr/lib64/pm-utils/sleep.d/52qubes-pause-vms resume suspend
+ExecStopPost=/usr/lib64/pm-utils/sleep.d/51qubes-suspend-netvm resume suspend
+
+[Install]
+WantedBy=sleep.target
diff --git a/rpm_spec/core-dom0-linux.spec b/rpm_spec/core-dom0-linux.spec
index f7077fb..1dc7627 100644
--- a/rpm_spec/core-dom0-linux.spec
+++ b/rpm_spec/core-dom0-linux.spec
@@ -115,6 +115,8 @@ mkdir -p $RPM_BUILD_ROOT/usr/lib64/pm-utils/sleep.d
 cp pm-utils/01qubes-sync-vms-clock $RPM_BUILD_ROOT/usr/lib64/pm-utils/sleep.d/
 cp pm-utils/51qubes-suspend-netvm $RPM_BUILD_ROOT/usr/lib64/pm-utils/sleep.d/
 cp pm-utils/52qubes-pause-vms $RPM_BUILD_ROOT/usr/lib64/pm-utils/sleep.d/
+mkdir -p $RPM_BUILD_ROOT/usr/lib/systemd/system
+cp pm-utils/qubes-suspend.service $RPM_BUILD_ROOT/usr/lib/systemd/system/
 
 ### Dracut module
 mkdir -p $RPM_BUILD_ROOT/etc/dracut.conf.d
@@ -166,6 +168,8 @@ echo 'installonlypkgs = kernel, kernel-qubes-vm' >> /etc/yum.conf
 mkdir -p /var/lib/qubes/removed-udev-scripts
 mv -f /lib/udev/rules.d/69-xorg-vmmouse.rules /var/lib/qubes/removed-udev-scripts/ 2> /dev/null || :
 
+systemctl enable qubes-suspend.service >/dev/null 2>&1
+
 %preun
 if [ "$1" = 0 ] ; then
 	# no more packages left
@@ -175,6 +179,8 @@ if [ "$1" = 0 ] ; then
 	done
 
     xdg-desktop-menu uninstall /usr/share/qubes-appmenus/qubes-dispvm.directory /usr/share/qubes-appmenus/qubes-dispvm-firefox.desktop
+
+    systemctl disable qubes-suspend.service > /dev/null 2>&1
 fi
 
 %triggerin -- PackageKit
@@ -229,6 +235,7 @@ mv -f /lib/udev/rules.d/69-xorg-vmmouse.rules /var/lib/qubes/removed-udev-script
 /usr/lib64/pm-utils/sleep.d/01qubes-sync-vms-clock
 /usr/lib64/pm-utils/sleep.d/51qubes-suspend-netvm
 /usr/lib64/pm-utils/sleep.d/52qubes-pause-vms
+/usr/lib/systemd/system/qubes-suspend.service
 # Others
 /etc/sysconfig/iptables
 /etc/sysconfig/ip6tables