diff --git a/misc/chrome/gophertool/gopher.js b/misc/chrome/gophertool/gopher.js
index 3238f0fccd..686e2175f9 100644
--- a/misc/chrome/gophertool/gopher.js
+++ b/misc/chrome/gophertool/gopher.js
@@ -13,20 +13,22 @@ function urlForInput(t) {
 
     if (numericRE.test(t)) {
         if (t < 150000) {
-            return "http://code.google.com/p/go/issues/detail?id=" + t;
+            // We could use the golang.org/cl/ handler here, but
+            // avoid some redirect latency and go right there, since
+            // one is easy. (no server-side mapping)
+            return "https://github.com/golang/go/issues/" + t;
         }
-        return "http://codereview.appspot.com/" + t + "/";
+        return "https://golang.org/cl/" + t;
     }
 
     var match = commitRE.exec(t);
     if (match) {
-        return "http://code.google.com/p/go/source/detail?r=" + match[1];
+        return "https://golang.org/change/" + match[1];
     }
 
     if (pkgRE.test(t)) {
         // TODO: make this smarter, using a list of packages + substring matches.
         // Get the list from godoc itself in JSON format?
-        // TODO: prefer localhost:6060 to golang.org if localhost:6060 is responding. 
         return "http://golang.org/pkg/" + t;
     }