diff --git a/Makefile b/Makefile
index e1fd207..a859f38 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,8 @@ all:
 SYSTEM_DROPIN_DIR ?= "lib/systemd/system"
 USER_DROPIN_DIR ?= "usr/lib/systemd/user"
 
-SYSTEM_DROPINS := chronyd.service crond.service cups.service cups.path cups.socket ModemManager.service
+SYSTEM_DROPINS := chronyd.service crond.service
+SYSTEM_DROPINS += cups.service cups-browsed.service cups.path cups.socket ModemManager.service
 SYSTEM_DROPINS += NetworkManager.service NetworkManager-wait-online.service ntpd.service getty@tty.service
 SYSTEM_DROPINS += tinyproxy.service
 SYSTEM_DROPINS += tmp.mount
diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec
index b0a7bea..a65c8ad 100644
--- a/rpm_spec/core-vm.spec
+++ b/rpm_spec/core-vm.spec
@@ -661,6 +661,7 @@ The Qubes core startup configuration for SystemD init.
 /lib/systemd/system/cups.service.d/30_qubes.conf
 /lib/systemd/system/cups.socket.d/30_qubes.conf
 /lib/systemd/system/cups.path.d/30_qubes.conf
+/lib/systemd/system/cups-browsed.service.d/30_qubes.conf
 /lib/systemd/system/org.cups.cupsd.service.d/30_qubes.conf
 /lib/systemd/system/org.cups.cupsd.socket.d/30_qubes.conf
 /lib/systemd/system/org.cups.cupsd.path.d/30_qubes.conf
diff --git a/vm-systemd/cups-browsed.service.d/30_qubes.conf b/vm-systemd/cups-browsed.service.d/30_qubes.conf
new file mode 100644
index 0000000..54104ad
--- /dev/null
+++ b/vm-systemd/cups-browsed.service.d/30_qubes.conf
@@ -0,0 +1,3 @@
+[Unit]
+ConditionPathExists=/var/run/qubes-service/cups
+After=qubes-sysinit.service