diff --git a/Makefile b/Makefile
index 7dee206..0139091 100644
--- a/Makefile
+++ b/Makefile
@@ -89,6 +89,8 @@ ifeq ($(shell lsb_release -is), Debian)
 
     SYSTEM_DROPINS += anacron.service
     SYSTEM_DROPINS += anacron-resume.service
+    SYSTEM_DROPINS += exim4.service
+    SYSTEM_DROPINS += avahi-daemon.service
 endif
 
 install-systemd-dropins:
diff --git a/debian/qubes-core-agent.postinst b/debian/qubes-core-agent.postinst
index d61b5c8..c985097 100755
--- a/debian/qubes-core-agent.postinst
+++ b/debian/qubes-core-agent.postinst
@@ -124,6 +124,10 @@ case "${1}" in
         done
         dpkg-divert --divert /etc/init/serial.conf.qubes-orig --package qubes-core-agent --rename --add /etc/init/serial.conf
 
+        if [ ! -L /etc/systemd/system/rpcbind.service ]; then
+            ln -s /dev/null /etc/systemd/system/rpcbind.service
+        fi
+
         # Remove old firmware updates link
         if [ -L /lib/firmware/updates ]; then
             rm -f /lib/firmware/updates
diff --git a/vm-systemd/avahi-daemon.service.d/30_qubes.conf b/vm-systemd/avahi-daemon.service.d/30_qubes.conf
new file mode 100644
index 0000000..2eed017
--- /dev/null
+++ b/vm-systemd/avahi-daemon.service.d/30_qubes.conf
@@ -0,0 +1,2 @@
+[Unit]
+ConditionPathExists=/var/run/qubes-service/avahi
diff --git a/vm-systemd/exim4.service.d/30_qubes.conf b/vm-systemd/exim4.service.d/30_qubes.conf
new file mode 100644
index 0000000..ce56860
--- /dev/null
+++ b/vm-systemd/exim4.service.d/30_qubes.conf
@@ -0,0 +1,2 @@
+[Unit]
+ConditionPathExists=/var/run/qubes-service/exim4