diff --git a/TODO b/TODO
index 6207316b..536ad52e 100644
--- a/TODO
+++ b/TODO
@@ -16,3 +16,10 @@ Planned feature improvements
   algorithm
 
 * include support for delayed standbys
+
+* Create the repmgr user/database on "master register".
+
+* Use pg_basebackup for the data directory, and ALSO rsync for the
+configuration files.
+
+* Use pg_basebackup -X s