diff --git a/units/fedora/killall.service b/units/fedora/killall.service
index 13bb564ad5d..09781075bfd 100644
--- a/units/fedora/killall.service
+++ b/units/fedora/killall.service
@@ -17,6 +17,7 @@
 
 [Unit]
 Description=Kill All Processes
+After=shutdown.target
 
 [Service]
 Type=finish
diff --git a/units/fedora/prefdm.service b/units/fedora/prefdm.service
index 7df09ac84d0..227ffbaad8e 100644
--- a/units/fedora/prefdm.service
+++ b/units/fedora/prefdm.service
@@ -19,6 +19,7 @@
 Description=Display Manager
 Before=graphical.target
 After=basic.target syslog.target messagebus.service haldaemon.service
+Conflicts=shutdown.target
 
 [Service]
 ExecStart=/etc/X11/prefdm -nodaemon
diff --git a/units/fedora/rc-local.service b/units/fedora/rc-local.service
index e8284a183af..30a2c8afbdc 100644
--- a/units/fedora/rc-local.service
+++ b/units/fedora/rc-local.service
@@ -18,6 +18,7 @@
 [Unit]
 Description=/etc/rc.local Compatibility
 Requires=basic.target
+Conflicts=shutdown.target
 
 # The rcN.d symlink uses the name "local" while the script itself is
 # called "rc.local", hence carry both names here.
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index ffcc42aad95..890b4897a34 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -23,6 +23,7 @@ m4_dnl
 Description=Getty on %I
 Before=getty.target
 After=basic.target
+Conflicts=shutdown.target
 
 [Service]
 Type=simple