diff --git a/TODO b/TODO
index 744d038827..415eb76224 100644
--- a/TODO
+++ b/TODO
@@ -27,6 +27,8 @@ Features:
 
 * invoke vhangup() before and after invoking getty
 
+* skip readahead on physically r/o media
+
 * support "auto" and "comment=systemd.automount" at the same time for an fstab entry
 
 * Make use of UnknownInterface, UnknownObject
diff --git a/units/plymouth-quit.service b/units/plymouth-quit.service
index dabe7c2d49..164499a2a6 100644
--- a/units/plymouth-quit.service
+++ b/units/plymouth-quit.service
@@ -12,3 +12,4 @@ After=rc-local.service plymouth-start.service
 [Service]
 ExecStart=-/bin/plymouth quit
 Type=oneshot
+TimeoutSec=20