diff --git a/TODO b/TODO
index 9bb01fd574..3ca3c5ec35 100644
--- a/TODO
+++ b/TODO
@@ -19,6 +19,8 @@ Janitorial Clean-ups:
 * rework mount.c and swap.c to follow proper state enumeration/deserialization
   semantics, like we do for device.c now
 
+* udev: drop "collect", it's nonsense
+
 Features:
 
 * logind: maybe watch utmp asynchronously using inotify, and populate our own
@@ -45,6 +47,10 @@ Features:
   units, and we should only enqeueu stop jobs from a defer event that processes
   queue instead of right-away when we assume that a unit is now unneeded.
 
+* nspawn: make nspawn suitable for shell pipelines: instead of triggering a
+  hangup when input is finished, send ^D, which synthesizes an EOF. Then wait
+  for hangup or ^D before passing on the EOF.
+
 * When reloading configuration PID 1 should reset all its properties to the
   original defaults before calling parse_config()