diff --git a/cmd/goimports/doc.go b/cmd/goimports/doc.go
index c7d2da3e45..46b2b07dfa 100644
--- a/cmd/goimports/doc.go
+++ b/cmd/goimports/doc.go
@@ -18,8 +18,8 @@ Then in your .emacs file:
    (add-hook 'before-save-hook 'gofmt-before-save)
 
 For vim, set "gofmt_command" to "goimports":
-    https://code.google.com/p/go/source/detail?r=39c724dd7f252
-    https://code.google.com/p/go/source/browse#hg%2Fmisc%2Fvim
+    https://golang.org/change/39c724dd7f252
+    https://golang.org/wiki/IDEsAndTextEditorPlugins
     etc
 
 For GoSublime, follow the steps described here:
diff --git a/cmd/present/doc.go b/cmd/present/doc.go
index 0fe11cd845..fafcefed08 100644
--- a/cmd/present/doc.go
+++ b/cmd/present/doc.go
@@ -18,7 +18,7 @@ Usage of present:
   -play=true: enable playground (permit execution of arbitrary user code)
 
 The setup of the Go version of NaCl is documented at:
-https://code.google.com/p/go-wiki/wiki/NativeClient
+https://golang.org/wiki/NativeClient
 
 Input files are named foo.extension, where "extension" defines the format of
 the generated output. The supported formats are:
diff --git a/dashboard/coordinator/buildongce/create.go b/dashboard/coordinator/buildongce/create.go
index 82b3418b8b..5a39ac08d1 100644
--- a/dashboard/coordinator/buildongce/create.go
+++ b/dashboard/coordinator/buildongce/create.go
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// +build ignore
+
 package main // import "golang.org/x/tools/dashboard/coordinator/buildongce"
 
 import (
@@ -19,7 +21,7 @@ import (
 	"time"
 
 	"code.google.com/p/goauth2/oauth"
-	compute "code.google.com/p/google-api-go-client/compute/v1"
+	compute "google.golang.org/api/compute/v1"
 )
 
 var (
@@ -127,7 +129,7 @@ func main() {
 		if err != nil {
 			log.Fatal(err)
 		}
-		// http://godoc.org/code.google.com/p/google-api-go-client/compute/v1#AddressAggregatedList
+		// https://godoc.org/google.golang.org/api/compute/v1#AddressAggregatedList
 	IPLoop:
 		for _, asl := range aggAddrList.Items {
 			for _, addr := range asl.Addresses {
diff --git a/refactor/eg/testdata/F1.go b/refactor/eg/testdata/F1.go
index 0b9c678448..2258abda5f 100644
--- a/refactor/eg/testdata/F1.go
+++ b/refactor/eg/testdata/F1.go
@@ -37,7 +37,7 @@ func example(n int) {
 	z.Lock()
 
 	// Should be no match however currently matches due to:
-	// https://code.google.com/p/go/issues/detail?id=8584
+	// https://golang.org/issue/8584
 	// Will start failing when this is fixed then just change golden to
 	// No match pointer indirect
 	// a.Lock()
diff --git a/refactor/eg/testdata/F1.golden b/refactor/eg/testdata/F1.golden
index c691b37cfc..5ffda69855 100644
--- a/refactor/eg/testdata/F1.golden
+++ b/refactor/eg/testdata/F1.golden
@@ -37,7 +37,7 @@ func example(n int) {
 	z.RLock()
 
 	// Should be no match however currently matches due to:
-	// https://code.google.com/p/go/issues/detail?id=8584
+	// https://golang.org/issue/8584
 	// Will start failing when this is fixed then just change golden to
 	// No match pointer indirect
 	// a.Lock()