diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index 0285c1a..c0a5455 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -903,6 +903,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