diff --git a/doc/code.html b/doc/code.html
index 703f38a21a3..796431aa144 100644
--- a/doc/code.html
+++ b/doc/code.html
@@ -166,7 +166,7 @@ To learn more about the <code>GOPATH</code> environment variable, see
 
 <p>
 To use a custom workspace location,
-<a href="https://golang.org/wiki/EnvVariables#gopath">set the <code>GOPATH</code> environment variable</a>.
+<a href="https://golang.org/wiki/SettingGOPATH">set the <code>GOPATH</code> environment variable</a>.
 </p>
 
 <h3 id="ImportPaths">Import paths</h3>
diff --git a/src/cmd/go/alldocs.go b/src/cmd/go/alldocs.go
index 57716a53f83..e93fd6ebed7 100644
--- a/src/cmd/go/alldocs.go
+++ b/src/cmd/go/alldocs.go
@@ -935,6 +935,8 @@
 // unless that directory holds a Go distribution.
 // Run "go env GOPATH" to see the current GOPATH.
 //
+// See https://golang.org/wiki/SettingGOPATH to set a custom GOPATH.
+//
 // Each directory listed in GOPATH must have a prescribed structure:
 //
 // The src directory holds source code.  The path below src
diff --git a/src/cmd/go/help.go b/src/cmd/go/help.go
index fb69d8ec543..0c663ad463f 100644
--- a/src/cmd/go/help.go
+++ b/src/cmd/go/help.go
@@ -295,6 +295,8 @@ to a subdirectory named "go" in the user's home directory
 unless that directory holds a Go distribution.
 Run "go env GOPATH" to see the current GOPATH.
 
+See https://golang.org/wiki/SettingGOPATH to set a custom GOPATH.
+
 Each directory listed in GOPATH must have a prescribed structure:
 
 The src directory holds source code.  The path below src