diff --git a/Makefile.am b/Makefile.am
index c2e903ad69..e73741f853 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -941,8 +941,10 @@ install-data-hook:
 		$(LN_S) ../systemd-update-utmp-runlevel.service )
 	( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
 		rm -f systemd-update-utmp-shutdown.service \
+			hwclock-save.service \
 			systemd-random-seed-save.service && \
 		$(LN_S) ../systemd-update-utmp-shutdown.service && \
+		$(LN_S) ../hwclock-save.service && \
 		$(LN_S) ../systemd-random-seed-save.service )
 	( cd $(DESTDIR)$(sessionunitdir) && \
 		rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
@@ -987,6 +989,7 @@ install-data-hook:
 			systemd-vconsole-setup.service \
 			systemd-modules-load.service \
 			systemd-random-seed-load.service \
+			hwclock-load.service \
 			tmpwatch.timer \
 			tmpwatch.service && \
 		$(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
@@ -997,6 +1000,7 @@ install-data-hook:
 		$(LN_S) ../systemd-vconsole-setup.service && \
 		$(LN_S) ../systemd-modules-load.service && \
 		$(LN_S) ../systemd-random-seed-load.service && \
+		$(LN_S) ../hwclock-load.service && \
 		$(LN_S) ../tmpwatch.timer && \
 		$(LN_S) ../tmpwatch.service )
 	( cd $(DESTDIR)$(dbussessionservicedir) && \
diff --git a/units/hwclock-load.service b/units/hwclock-load.service
index 85d56db5d2..493c7653a9 100644
--- a/units/hwclock-load.service
+++ b/units/hwclock-load.service
@@ -26,6 +26,3 @@ ExecStart=/sbin/hwclock --systz
 # Note that we do not run --hctosys here, we assume the kernel
 # includes a compiled in RTC module which is used to initialize the
 # system time as part of kernel setup.
-
-[Install]
-WantedBy=sysinit.target
diff --git a/units/hwclock-save.service b/units/hwclock-save.service
index 23866d2fb6..067196f6f1 100644
--- a/units/hwclock-save.service
+++ b/units/hwclock-save.service
@@ -13,6 +13,3 @@ Before=poweroff.service reboot.service halt.service killall.service
 [Service]
 Type=oneshot
 ExecStart=/sbin/hwclock --systohc
-
-[Install]
-WantedBy=shutdown.target