diff --git a/TODO b/TODO
index 89303f1220..7f9d259413 100644
--- a/TODO
+++ b/TODO
@@ -20,6 +20,18 @@ Janitorial Clean-ups:
 
 Features:
 
+* cryptsetup: optionally, when run during boot-up and password is never
+  entered, and we are on AC power (or so), power off machine again
+
+* when configuring loopback netif, and it fails due to EPERM, eat up error if
+  it happens to be set up alright already.
+
+* at boot: check if battery above some threshold, if not power off again after explanation
+
+* userdb: add field for ambient caps, so that a user can have CAP_WAKE_ALARM
+  for example. And add code that resets ambient caps for all services by
+  default.
+
 * homed: try to unmount in regular intervals when home dir was busy when we
   tried because idle.