diff --git a/TODO b/TODO
index 8d03d950c06..1537e2797d0 100644
--- a/TODO
+++ b/TODO
@@ -33,9 +33,7 @@ Features:
 
 * drop /.readahead on bigger upgrades with yum
 
-* add inode stat() check to readahead
-
-* plymouth.enable=0
+* add inode stat() check to readahead to suppress preloading changed files
 
 * include /usr/local/lib/tmpfiles.d in tmpfiles tool as search path
   (and prefix/lib, in case it isn't one of the listed ones)
diff --git a/units/plymouth-halt.service b/units/plymouth-halt.service
index 962d829fff7..2e194b360e1 100644
--- a/units/plymouth-halt.service
+++ b/units/plymouth-halt.service
@@ -10,6 +10,7 @@ Description=Show Plymouth Halt Screen
 After=getty@tty1.service prefdm.service plymouth-start.service
 Before=halt.service
 DefaultDependencies=no
+ConditionKernelCommandLine=!plymouth.enable=0
 
 [Service]
 ExecStart=/sbin/plymouthd --mode=shutdown
diff --git a/units/plymouth-kexec.service b/units/plymouth-kexec.service
index 0d7450feea5..919c3f12948 100644
--- a/units/plymouth-kexec.service
+++ b/units/plymouth-kexec.service
@@ -10,6 +10,7 @@ Description=Show Plymouth Reboot with kexec Screen
 After=getty@tty1.service prefdm.service plymouth-start.service
 Before=kexec.service
 DefaultDependencies=no
+ConditionKernelCommandLine=!plymouth.enable=0
 
 [Service]
 ExecStart=/sbin/plymouthd --mode=shutdown
diff --git a/units/plymouth-poweroff.service b/units/plymouth-poweroff.service
index d4979df1e07..8fcff3bab14 100644
--- a/units/plymouth-poweroff.service
+++ b/units/plymouth-poweroff.service
@@ -10,6 +10,7 @@ Description=Show Plymouth Power Off Screen
 After=getty@tty1.service prefdm.service plymouth-start.service
 Before=poweroff.service
 DefaultDependencies=no
+ConditionKernelCommandLine=!plymouth.enable=0
 
 [Service]
 ExecStart=/sbin/plymouthd --mode=shutdown
diff --git a/units/plymouth-reboot.service b/units/plymouth-reboot.service
index 7304a5fba2f..fb65bcc8365 100644
--- a/units/plymouth-reboot.service
+++ b/units/plymouth-reboot.service
@@ -10,6 +10,7 @@ Description=Show Plymouth Reboot Screen
 After=getty@tty1.service prefdm.service plymouth-start.service
 Before=reboot.service
 DefaultDependencies=no
+ConditionKernelCommandLine=!plymouth.enable=0
 
 [Service]
 ExecStart=/sbin/plymouthd --mode=shutdown
diff --git a/units/plymouth-start.service b/units/plymouth-start.service
index 10d03c6c62d..f618257a937 100644
--- a/units/plymouth-start.service
+++ b/units/plymouth-start.service
@@ -14,6 +14,7 @@ Before=systemd-ask-password-plymouth.service
 
 # Dracut informs us with this flag file if plymouth is already running
 ConditionPathExists=!/run/plymouth/pid
+ConditionKernelCommandLine=!plymouth.enable=0
 
 [Service]
 ExecStart=/sbin/plymouthd --mode=boot --pid-file=/run/plymouth/pid