diff --git a/Makefile b/Makefile
index 5af0eb2..2a98a8b 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ DIRS = \
 	/usr/share/man/man5 \
 	/usr/share/man/man1 \
 	/usr/share/mkinitcpio \
-	/usr/lib/systemd/system/shutdown.target.wants \
+	/usr/lib/systemd/system/basic.target.wants \
 	/usr/lib/tmpfiles.d
 
 all: doc
@@ -55,7 +55,7 @@ install: all
 	install -m644 systemd/mkinitcpio-generate-shutdown-ramfs.service \
 			$(DESTDIR)/usr/lib/systemd/system/mkinitcpio-generate-shutdown-ramfs.service
 	ln -s ../mkinitcpio-generate-shutdown-ramfs.service \
-			$(DESTDIR)/usr/lib/systemd/system/shutdown.target.wants/mkinitcpio-generate-shutdown-ramfs.service
+			$(DESTDIR)/usr/lib/systemd/system/basic.target.wants/mkinitcpio-generate-shutdown-ramfs.service
 	install -m644 tmpfiles/mkinitcpio.conf $(DESTDIR)/usr/lib/tmpfiles.d/mkinitcpio.conf
 
 	install -m755 50-mkinitcpio.install $(DESTDIR)/usr/lib/kernel/install.d/50-mkinitcpio.install
diff --git a/install/sd-shutdown b/install/sd-shutdown
index cd4686f..339de41 100644

diff --git a/systemd/mkinitcpio-generate-shutdown-ramfs.service b/systemd/mkinitcpio-generate-shutdown-ramfs.service
index 923dd59..13d6b2d 100644
--- a/systemd/mkinitcpio-generate-shutdown-ramfs.service
+++ b/systemd/mkinitcpio-generate-shutdown-ramfs.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Generate shutdown-ramfs
 DefaultDependencies=no
-Before=shutdown.target
+After=basic.target
 ConditionFileIsExecutable=!/run/initramfs/shutdown
 
 [Service]