diff --git a/TODO b/TODO
index 1eadab3116..6a51cf92fe 100644
--- a/TODO
+++ b/TODO
@@ -26,12 +26,16 @@ External:
 
 Before 220:
 
-* fix userns support in nspawn, or remove it entirely
-
 * bus-proxy: GetConnectionSELinuxSecurityContext() is completely broken
 
 Features:
 
+* introduce an NSS module that uses machined info to give container UIDs pretty names when user namespacing is used.
+
+* stop using off_t, it's a crazy type. Use uint64_t instead.
+
+* introduce PERSONALITY_INVALID
+
 * logind: follow PropertiesChanged state more closely, to deal with quick logouts and relogins
 
 * change to KillMode=mixed by default