diff --git a/linux/systemd/Makefile b/linux/systemd/Makefile
index 5566870c..3522d8ca 100644
--- a/linux/systemd/Makefile
+++ b/linux/systemd/Makefile
@@ -11,3 +11,6 @@ install:
 	cp qubes-reload-firewall@.timer $(DESTDIR)$(UNITDIR)
 	cp qubes-qmemman.service $(DESTDIR)$(UNITDIR)
 	cp qubesd.service $(DESTDIR)$(UNITDIR)
+	install -d $(DESTDIR)$(UNITDIR)/lvm2-pvscan@.service.d
+	install -m 0644 lvm2-pvscan@.service.d_30_qubes.conf \
+		$(DESTDIR)$(UNITDIR)/lvm2-pvscan@.service.d/30_qubes.conf
diff --git a/linux/systemd/lvm2-pvscan@.service.d_30_qubes.conf b/linux/systemd/lvm2-pvscan@.service.d_30_qubes.conf
new file mode 100644
index 00000000..2ebd1c60
--- /dev/null
+++ b/linux/systemd/lvm2-pvscan@.service.d_30_qubes.conf
@@ -0,0 +1,2 @@
+[Unit]
+Before=qubesd.service
diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec
index e0e6b00d..33929150 100644
--- a/rpm_spec/core-dom0.spec
+++ b/rpm_spec/core-dom0.spec
@@ -392,6 +392,7 @@ fi
 /usr/lib/qubes/fix-dir-perms.sh
 /usr/lib/qubes/startup-misc.sh
 /usr/libexec/qubes/qubesd-query-fast
+%{_unitdir}/lvm2-pvscan@.service.d/30_qubes.conf
 %{_unitdir}/qubes-core.service
 %{_unitdir}/qubes-qmemman.service
 %{_unitdir}/qubes-vm@.service