diff --git a/git_superproject.py b/git_superproject.py
index 2516545d..f4792f5d 100644
--- a/git_superproject.py
+++ b/git_superproject.py
@@ -272,8 +272,10 @@ class Superproject(object):
       else:
         projects_missing_commit_ids.append(path)
     if projects_missing_commit_ids:
+      # TODO(rtenneti): Come up with a solution to support non-google URL for
+      # filing bug reports.
       print('error: please file a bug using %s to report missing commit_ids for: %s' %
-            (Wrapper().BUG_URL, projects_missing_commit_ids), file=sys.stderr)
+            (Wrapper().BUG_URL_GOOGLE, projects_missing_commit_ids), file=sys.stderr)
       return None
 
     manifest_path = self._WriteManfiestFile()
diff --git a/repo b/repo
index b3f3673b..38c2255c 100755
--- a/repo
+++ b/repo
@@ -148,6 +148,9 @@ if not REPO_REV:
 # URL to file bug reports for repo tool issues.
 BUG_URL = 'https://bugs.chromium.org/p/gerrit/issues/entry?template=Repo+tool+issue'
 
+# URL to file bug reports for Google specific repo tool issues.
+BUG_URL_GOOGLE = 'go/repo-bug'
+
 # increment this whenever we make important changes to this script
 VERSION = (2, 14)