diff --git a/dispvm/Makefile b/dispvm/Makefile
index b7011986..9fab7451 100644
--- a/dispvm/Makefile
+++ b/dispvm/Makefile
@@ -1,3 +1,5 @@
+UNITDIR ?= /usr/lib/systemd/system
+
 all:
 	true
 
@@ -11,5 +13,9 @@ install:
 	cp qubes-prepare-saved-domain.sh  $(DESTDIR)/usr/lib/qubes
 	cp qubes-update-dispvm-savefile-with-progress.sh  $(DESTDIR)/usr/lib/qubes
 	cp qfile-daemon-dvm $(DESTDIR)/usr/lib/qubes
+	mkdir -p $(DESTDIR)$(UNITDIR)
+	cp startup-dvm.sh $(DESTDIR)/usr/lib/qubes
+	cp qubes-setupdvm.service $(DESTDIR)$(UNITDIR)
+
 
 
diff --git a/linux/systemd/qubes-setupdvm.service b/dispvm/qubes-setupdvm.service
similarity index 100%
rename from linux/systemd/qubes-setupdvm.service
rename to dispvm/qubes-setupdvm.service
diff --git a/linux/aux-tools/startup-dvm.sh b/dispvm/startup-dvm.sh
similarity index 100%
rename from linux/aux-tools/startup-dvm.sh
rename to dispvm/startup-dvm.sh
diff --git a/linux/aux-tools/Makefile b/linux/aux-tools/Makefile
index 813c7f58..123845da 100644
--- a/linux/aux-tools/Makefile
+++ b/linux/aux-tools/Makefile
@@ -5,7 +5,6 @@ install:
 	mkdir -p $(DESTDIR)/usr/lib/qubes
 	cp unbind-pci-device.sh $(DESTDIR)/usr/lib/qubes
 	cp cleanup-dispvms $(DESTDIR)/usr/lib/qubes
-	cp startup-dvm.sh $(DESTDIR)/usr/lib/qubes
 	cp startup-misc.sh $(DESTDIR)/usr/lib/qubes
 	cp prepare-volatile-img.sh $(DESTDIR)/usr/lib/qubes
 	cp vusb-ctl.py $(DESTDIR)/usr/lib/qubes/
diff --git a/linux/systemd/Makefile b/linux/systemd/Makefile
index 16b215ce..8f035146 100644
--- a/linux/systemd/Makefile
+++ b/linux/systemd/Makefile
@@ -7,10 +7,7 @@ install:
 	mkdir -p $(DESTDIR)$(UNITDIR)
 	cp qubes-block-cleaner.service $(DESTDIR)$(UNITDIR)
 	cp qubes-core.service $(DESTDIR)$(UNITDIR)
-	cp qubes-setupdvm.service $(DESTDIR)$(UNITDIR)
-	cp qubes-meminfo-writer.service $(DESTDIR)$(UNITDIR)
 	cp qubes-netvm.service $(DESTDIR)$(UNITDIR)
-	cp qubes-qmemman.service $(DESTDIR)$(UNITDIR)
 	cp qubes-vm@.service $(DESTDIR)$(UNITDIR)
 	cp qubes-reload-firewall@.service $(DESTDIR)$(UNITDIR)
 	cp qubes-reload-firewall@.timer $(DESTDIR)$(UNITDIR)
diff --git a/qmemman/Makefile b/qmemman/Makefile
index bc72d3e9..6c04a458 100644
--- a/qmemman/Makefile
+++ b/qmemman/Makefile
@@ -1,5 +1,6 @@
 PYTHON_QUBESPATH = $(PYTHON_SITEPATH)/qubes
 SYSCONFDIR ?= /etc
+UNITDIR ?= /usr/lib/systemd/system
 all:
 	python -m compileall .
 	python -O -m compileall .
@@ -18,4 +19,6 @@ endif
 	cp qmemman.conf $(DESTDIR)$(SYSCONFDIR)/qubes/
 	mkdir -p $(DESTDIR)/usr/lib/qubes
 	cp server.py $(DESTDIR)/usr/lib/qubes/qmemman_daemon.py
+	mkdir -p $(DESTDIR)$(UNITDIR)
+	cp qubes-qmemman.service $(DESTDIR)$(UNITDIR)
 
diff --git a/linux/systemd/qubes-qmemman.service b/qmemman/qubes-qmemman.service
similarity index 100%
rename from linux/systemd/qubes-qmemman.service
rename to qmemman/qubes-qmemman.service