diff --git a/buildbot/cbuildbot.py b/buildbot/cbuildbot.py
index 7250ce2..da5037c 100755
--- a/buildbot/cbuildbot.py
+++ b/buildbot/cbuildbot.py
@@ -737,6 +737,9 @@
                    help='Used with manifest logic.  Forces use of this version '
                         'rather than create or get latest.')
 
+  # Added for --remote compatibility against ToT; no-op option.
+  group.add_option('--remote-version', help=optparse.SUPPRESS_HELP)
+
   parser.add_option_group(group)
 
   # Debug options