diff --git a/src/cmd/go/help.go b/src/cmd/go/help.go
index 2e8e79a..f21d9b8 100644
--- a/src/cmd/go/help.go
+++ b/src/cmd/go/help.go
@@ -38,7 +38,7 @@
 unique prefix that belongs to you.  For example, paths used
 internally at Google all begin with 'google', and paths
 denoting remote repositories begin with the path to the code,
-such as 'project.googlecode.com/'.
+such as 'code.google.com/p/project'.
 	`,
 }
 
@@ -66,14 +66,11 @@
 
 	Google Code Project Hosting (Git, Mercurial, Subversion)
 
-		import "project.googlecode.com/git"
-		import "project.googlecode.com/git/sub/directory"
+		import "code.google.com/p/project"
+		import "code.google.com/p/project/sub/directory"
 
-		import "project.googlecode.com/hg"
-		import "project.googlecode.com/hg/sub/directory"
-
-		import "project.googlecode.com/svn/trunk"
-		import "project.googlecode.com/svn/trunk/sub/directory"
+		import "code.google.com/p/project.subrepository"
+		import "code.google.com/p/project.subrepository/sub/directory"
 
 	Launchpad (Bazaar)
 
diff --git a/src/cmd/go/list.go b/src/cmd/go/list.go
index 4d9fed7..21ebb5e 100644
--- a/src/cmd/go/list.go
+++ b/src/cmd/go/list.go
@@ -18,9 +18,9 @@
 
 The default output shows the package name and file system location:
 
-    books /home/you/src/google-api-go-client.googlecode.com/hg/books/v1
-    oauth /home/you/src/goauth2.googlecode.com/hg/oauth
-    sqlite /home/you/src/gosqlite.googlecode.com/hg/sqlite
+    books /home/you/src/code.google.com/p/google-api-go-client/books/v1
+    oauth /home/you/src/code.google.com/p/goauth2/oauth
+    sqlite /home/you/src/code.google.com/p/sqlite
 
 The -f flag specifies an alternate format for the list,
 using the syntax of package template.  The default output