diff --git a/README.md b/README.md
index ff387e16..b0910679 100644
--- a/README.md
+++ b/README.md
@@ -711,8 +711,9 @@ updated to reflect this:
 
 
 Note that with cascading replication, `repmgr standby follow` can also be
-used to detach a standby from its current upstream server and follow another
-upstream server, including the master.
+used to detach a standby from its current upstream server and follow the
+master. However it's currently not possible to have it follow another standby;
+we hope to improve this in a future release.
 
 
 Performing a switchover with repmgr
diff --git a/TODO b/TODO
index 0aa626a5..3b78a9b6 100644
--- a/TODO
+++ b/TODO
@@ -53,6 +53,9 @@ Planned feature improvements
   requested, activate the replication slot using pg_receivexlog to negate the
   need to set `wal_keep_segments` just for the initial clone (9.4 and 9.5).
 
+* repmgr: enable "standby follow" to point a standby at another standby, not
+  just the replication cluster master (see GitHub #130)
+
 
 Usability improvements
 ======================