diff --git a/TODO b/TODO
index 79093f40..df33fbb9 100644
--- a/TODO
+++ b/TODO
@@ -7,6 +7,7 @@ Known issues in repmgr
 
 * PGPASSFILE may not be passed to pg_basebackup
 
+
 Planned feature improvements
 ============================
 
@@ -46,5 +47,15 @@ Planned feature improvements
 
 * possibility to transform a failed master into a new standby with pg_rewind
 
-* "repmgr standby switchover" to promote a standby in a controlled manner 
+* "repmgr standby switchover" to promote a standby in a controlled manner
    and convert the existing primary into a standby
+
+* make repmgrd more robust
+
+Usability improvements
+======================
+
+* repmgrd: on failover, explicitly log which node is now being followed
+
+* debug output: show some repetitive output only if verbose flag set to prevent
+  excessive log growth