diff --git a/TODO.rst b/TODO.rst
index 03c7fbc..5874a9f 100644
--- a/TODO.rst
+++ b/TODO.rst
@@ -65,3 +65,6 @@
   not shown by default
 
 - rename keydir to keys, with backwards compatibility
+
+- get rid of username extraction from ssh key comment field, used only
+  in gitosis-init