diff --git a/Makefile.am b/Makefile.am
index d233da6ca58dba54e9ad5f807589990f893f5787..f5d46904afc6d54e177719568e66b02be8d67683 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -905,6 +905,7 @@ install-data-hook:
 		$(DESTDIR)$(systemunitdir)/sockets.target.wants \
 		$(DESTDIR)$(systemunitdir)/sysinit.target.wants \
 		$(DESTDIR)$(systemunitdir)/shutdown.target.wants \
+		$(DESTDIR)$(systemunitdir)/local-fs.target.wants \
 		$(DESTDIR)$(systemunitdir)/runlevel1.target.wants \
 		$(DESTDIR)$(systemunitdir)/runlevel2.target.wants \
 		$(DESTDIR)$(systemunitdir)/runlevel3.target.wants \
@@ -946,6 +947,12 @@ install-data-hook:
 		$(LN_S) ../systemd-update-utmp-shutdown.service && \
 		$(LN_S) ../hwclock-save.service && \
 		$(LN_S) ../systemd-random-seed-save.service )
+	( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
+		rm -f systemd-update-utmp-shutdown.service \
+			var-run.service \
+			var-lock.service && \
+		$(LN_S) ../var-run.service && \
+		$(LN_S) ../var-lock.service )
 	( cd $(DESTDIR)$(sessionunitdir) && \
 		rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
 		$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
diff --git a/units/var-lock.mount b/units/var-lock.mount
index 17c4f522ad7058c7b6ab81652ec90ca5a109e884..f14ea94d0436d4550a7cba7d90d184aae92e0ab2 100644
--- a/units/var-lock.mount
+++ b/units/var-lock.mount
@@ -14,6 +14,3 @@ What=tmpfs
 Where=/var/lock
 Type=tmpfs
 Options=mode=775,gid=lock
-
-[Install]
-WantedBy=local-fs.target
diff --git a/units/var-lock.service b/units/var-lock.service
index 9c307e109c5af78bc5f88071b0d5cbf19b193c09..c2e53cdb36b362f3ad0ecf41349f2c366bbaac48 100644
--- a/units/var-lock.service
+++ b/units/var-lock.service
@@ -16,6 +16,3 @@ Before=local-fs.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/bin/mkdir -p /var/lock/subsys
-
-[Install]
-WantedBy=local-fs.target
diff --git a/units/var-run.mount b/units/var-run.mount
index 90dfe0edaa0a1c0327efa63cf70e6a0c2fddc1fe..f7862895366987880e747d864ccf819bdf0db841 100644
--- a/units/var-run.mount
+++ b/units/var-run.mount
@@ -14,6 +14,3 @@ What=tmpfs
 Where=/var/run
 Type=tmpfs
 Options=mode=755
-
-[Install]
-WantedBy=local-fs.target
diff --git a/units/var-run.service b/units/var-run.service
index f493ee8ec1e43f77f7afff2e76c973b671654645..2cb861efc23bcce4876065839f02229c72e614fa 100644
--- a/units/var-run.service
+++ b/units/var-run.service
@@ -17,6 +17,3 @@ Type=oneshot
 RemainAfterExit=yes
 ExecStart=/bin/touch /var/run/utmp ; /bin/chmod 0664 /var/run/utmp ; /bin/chown root:utmp /var/run/utmp
 ExecStart=/bin/mkdir /var/run/user ; /bin/chmod 0755 /var/run/user ; -/sbin/restorecon /var/run/user
-
-[Install]
-WantedBy=local-fs.target