diff --git a/repo b/repo
index 7498d09c..176c5635 100755
--- a/repo
+++ b/repo
@@ -120,7 +120,7 @@ group.add_option('--mirror',
                  help='mirror the forrest')
 
 # Tool
-group = init_optparse.add_option_group('Version options')
+group = init_optparse.add_option_group('repo Version options')
 group.add_option('--repo-url',
                  dest='repo_url',
                  help='repo repository location', metavar='URL')
diff --git a/subcmds/init.py b/subcmds/init.py
index 103a78d6..3a5c766e 100644
--- a/subcmds/init.py
+++ b/subcmds/init.py
@@ -64,7 +64,7 @@ default.xml will be used.
 
 
     # Tool
-    g = p.add_option_group('Version options')
+    g = p.add_option_group('repo Version options')
     g.add_option('--repo-url',
                  dest='repo_url',
                  help='repo repository location', metavar='URL')
diff --git a/subcmds/selfupdate.py b/subcmds/selfupdate.py
index de6904c4..4f46a129 100644
--- a/subcmds/selfupdate.py
+++ b/subcmds/selfupdate.py
@@ -35,10 +35,11 @@ need to be performed by an end-user.
 """
 
   def _Options(self, p):
-    p.add_option('--no-repo-verify',
+    g = p.add_option_group('repo Version options')
+    g.add_option('--no-repo-verify',
                  dest='no_repo_verify', action='store_true',
                  help='do not verify repo source code')
-    p.add_option('--repo-upgraded',
+    g.add_option('--repo-upgraded',
                  dest='repo_upgraded', action='store_true',
                  help=SUPPRESS_HELP)
 
diff --git a/subcmds/sync.py b/subcmds/sync.py
index 55ffca3e..b5cc604e 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -66,10 +66,11 @@ revision is temporarily needed.
                  dest='detach_head', action='store_true',
                  help='detach projects back to manifest revision')
 
-    p.add_option('--no-repo-verify',
+    g = p.add_option_group('repo Version options')
+    g.add_option('--no-repo-verify',
                  dest='no_repo_verify', action='store_true',
                  help='do not verify repo source code')
-    p.add_option('--repo-upgraded',
+    g.add_option('--repo-upgraded',
                  dest='repo_upgraded', action='store_true',
                  help=SUPPRESS_HELP)