diff --git a/TODO b/TODO
index bb34a14ba6..c51205175a 100644
--- a/TODO
+++ b/TODO
@@ -11,8 +11,19 @@ Bugfixes:
 
 * make sure timeouts are applied to Type=oneshot services.
 
+* Dangling symlinks of .automount unit files in .wants/ directories, set up
+  automount points even when the original .automount file did not exist
+  anymore. Only the .mount unit was still around.
+
 Features:
 
+* internal restart counter for units (focus on auto-respawn)
+
+* finer-grained auto-respawn settings (rate-limit)
+
+* be able to specify a forced restart of service A where service B depends on, in case B
+  needs to be auto-respawned?
+
 * Something is wrong with symlink handling of "autovt@.service" in "systemctl list-unit-files"
 
 * introduce sd_log_open() to create a connection to the syslog bridge via sd-daemon.h
@@ -100,7 +111,8 @@ Features:
   - how to pass throw-away units to systemd, or dynamically change properties of existing units
   - how to integrate cgconfig and suchlike with systemd
   - security properties
-  - inetd conversion
+  - xinetd conversion
+  - details of instantiated @.service setups
 
 * allow port=0 in .socket units