diff --git a/README.md b/README.md
index 533b38532f..436be77a6c 100644
--- a/README.md
+++ b/README.md
@@ -61,10 +61,10 @@ To contribute change for review:
     ...
     git cl upload -t "Fixes goat teleporter destination to be Australia"
 
-See also [open bugs](https://bugs.chromium.org/p/chromium/issues/list?can=2&q=component%3AInfra%3ESDK),
+See also [open bugs](https://issues.chromium.org/issues?q=status:open%20componentid:1456102),
 [open reviews](https://chromium-review.googlesource.com/q/status:open+project:chromium%252Ftools%252Fdepot_tools),
 [forum](https://groups.google.com/a/chromium.org/forum/#!forum/infra-dev) or
-[report problems](https://bugs.chromium.org/p/chromium/issues/entry?components=Infra%3ESDK).
+[report problems](https://issues.chromium.org/issues/new?component=1456102).
 
 ### cpplint.py
 
diff --git a/man/html/depot_tools_tutorial.html b/man/html/depot_tools_tutorial.html
index 216fcfe5e9..16c66adc91 100644
--- a/man/html/depot_tools_tutorial.html
+++ b/man/html/depot_tools_tutorial.html
@@ -950,7 +950,7 @@ If you see strange errors with the file system on the first run of gclient,
 After running gclient open a command prompt and type <code>where python</code> and confirm that
   the depot_tools python.bat comes ahead of any copies of python.exe. Failing to ensure
   this can lead to overbuilding when using gn - see
-  <a href="https://bugs.chromium.org/p/chromium/issues/detail?id=611087">crbug.com/611087</a>.
+  <a href="https://issues.chromium.org/issues/41253477">crbug.com/41253477</a>.
 </p>
 </li>
 </ul></div>
diff --git a/man/src/depot_tools_tutorial.txt b/man/src/depot_tools_tutorial.txt
index ff325df7fc..eec4b315f1 100644
--- a/man/src/depot_tools_tutorial.txt
+++ b/man/src/depot_tools_tutorial.txt
@@ -124,7 +124,7 @@ code, including msysgit and python.
 * After running gclient open a command prompt and type `where python` and confirm that
   the depot_tools python.bat comes ahead of any copies of python.exe. Failing to ensure
   this can lead to overbuilding when using gn - see
-  link:https://bugs.chromium.org/p/chromium/issues/detail?id=611087[crbug.com/611087].
+  link:https://issues.chromium.org/issues/41253477[crbug.com/41253477].
 =====
 endif::backend-xhtml11[]
 
diff --git a/recipes/recipe_modules/presubmit/api.py b/recipes/recipe_modules/presubmit/api.py
index 47748a3c68..37dc4fc99f 100644
--- a/recipes/recipe_modules/presubmit/api.py
+++ b/recipes/recipe_modules/presubmit/api.py
@@ -194,12 +194,10 @@ class PresubmitApi(recipe_api.RecipeApi):
     if raw_result.summary_markdown == '':
       raw_result.status = common_pb2.INFRA_FAILURE
       raw_result.summary_markdown = (
-        'Something unexpected occurred'
-        ' while running presubmit checks.'
-        ' Please [file a bug](https://bugs.chromium.org'
-        '/p/chromium/issues/entry?components='
-        'Infra%3EClient%3EChrome&status=Untriaged)'
-      )
+          'Something unexpected occurred'
+          ' while running presubmit checks.'
+          ' Please [file a bug](https://issues.chromium.org'
+          '/issues/new?component=1456211)')
     return raw_result
 
 
diff --git a/recipes/recipe_modules/presubmit/tests/execute.py b/recipes/recipe_modules/presubmit/tests/execute.py
index 85f756534d..2f80750768 100644
--- a/recipes/recipe_modules/presubmit/tests/execute.py
+++ b/recipes/recipe_modules/presubmit/tests/execute.py
@@ -209,13 +209,10 @@ def GenTests(api):
         ```
         ''').strip()) + api.post_process(post_process.DropExpectation))
 
-  bug_msg = (
-    'Something unexpected occurred'
-    ' while running presubmit checks.'
-    ' Please [file a bug](https://bugs.chromium.org'
-    '/p/chromium/issues/entry?components='
-    'Infra%3EClient%3EChrome&status=Untriaged)'
-  )
+  bug_msg = ('Something unexpected occurred'
+             ' while running presubmit checks.'
+             ' Please [file a bug](https://issues.chromium.org'
+             '/issues/new?component=1456211)')
   yield (api.test('failure-no-json', status="INFRA_FAILURE") +
          api.runtime(is_experimental=False) +
          api.buildbucket.try_build(project='infra') +