diff --git a/cmd/godoc/handlers.go b/cmd/godoc/handlers.go
index 5d1ee6d8..3b43a78f 100644
--- a/cmd/godoc/handlers.go
+++ b/cmd/godoc/handlers.go
@@ -125,19 +125,38 @@ var cmdRedirects = map[string]string{
 }
 
 var redirects = map[string]string{
-	"/blog":   "http://blog.golang.org",
-	"/build":  "http://build.golang.org",
-	"/change": "https://code.google.com/p/go/source/list",
-	"/cl":     "https://gocodereview.appspot.com/",
-	"/doc/go_for_cpp_programmers.html": "https://code.google.com/p/go-wiki/wiki/GoForCPPProgrammers",
-	"/doc/go_tutorial.html":            "http://tour.golang.org/",
-	"/issue":                           "https://code.google.com/p/go/issues",
-	"/issue/new":                       "https://code.google.com/p/go/issues/entry",
-	"/issues":                          "https://code.google.com/p/go/issues",
-	"/play":                            "http://play.golang.org",
-	"/talks":                           "http://talks.golang.org",
-	"/tour":                            "http://tour.golang.org",
-	"/wiki":                            "https://code.google.com/p/go-wiki/w/list",
+	"/blog":      "http://blog.golang.org",
+	"/build":     "http://build.golang.org",
+	"/change":    "https://code.google.com/p/go/source/list",
+	"/cl":        "https://gocodereview.appspot.com/",
+	"/issue":     "https://code.google.com/p/go/issues",
+	"/issue/new": "https://code.google.com/p/go/issues/entry",
+	"/issues":    "https://code.google.com/p/go/issues",
+	"/play":      "http://play.golang.org",
+	"/ref":       "/doc/#references",
+	"/ref/":      "/doc/#references",
+	"/ref/mem":   "/doc/mem",
+	"/ref/spec":  "/doc/spec",
+	"/talks":     "http://talks.golang.org",
+	"/tour":      "http://tour.golang.org",
+	"/wiki":      "https://code.google.com/p/go-wiki/w/list",
+
+	"/doc/articles/c_go_cgo.html":                    "/blog/c-go-cgo",
+	"/doc/articles/concurrency_patterns.html":        "/blog/go-concurrency-patterns-timing-out-and",
+	"/doc/articles/defer_panic_recover.html":         "/blog/defer-panic-and-recover",
+	"/doc/articles/error_handling.html":              "/blog/error-handling-and-go",
+	"/doc/articles/gobs_of_data.html":                "/blog/gobs-of-data",
+	"/doc/articles/godoc_documenting_go_code.html":   "/blog/godoc-documenting-go-code",
+	"/doc/articles/gos_declaration_syntax.html":      "/blog/gos-declaration-syntax",
+	"/doc/articles/image_draw.html":                  "/blog/go-imagedraw-package",
+	"/doc/articles/image_package.html":               "/blog/go-image-package",
+	"/doc/articles/json_and_go.html":                 "/blog/json-and-go",
+	"/doc/articles/json_rpc_tale_of_interfaces.html": "/blog/json-rpc-tale-of-interfaces",
+	"/doc/articles/laws_of_reflection.html":          "/blog/laws-of-reflection",
+	"/doc/articles/race_detector.html":               "/blog/race-detector",
+	"/doc/articles/slices_usage_and_internals.html":  "/blog/go-slices-usage-and-internals",
+	"/doc/go_for_cpp_programmers.html":               "https://code.google.com/p/go-wiki/wiki/GoForCPPProgrammers",
+	"/doc/go_tutorial.html":                          "http://tour.golang.org/",
 }
 
 var prefixHelpers = map[string]string{
diff --git a/godoc/static/godoc.html b/godoc/static/godoc.html
index 59a3a102..11766986 100644
--- a/godoc/static/godoc.html
+++ b/godoc/static/godoc.html
@@ -20,7 +20,6 @@
 <form method="GET" action="/search">
 <div id="menu">
 <a href="/doc/">Documents</a>
-<a href="/ref/">References</a>
 <a href="/pkg/">Packages</a>
 <a href="/project/">The Project</a>
 <a href="/help/">Help</a>
diff --git a/godoc/static/package.html b/godoc/static/package.html
index 8d28652f..ee38396f 100644
--- a/godoc/static/package.html
+++ b/godoc/static/package.html
@@ -221,6 +221,6 @@
 	{{end}}
 	</table>
 	{{if $.PDoc}}{{else}}
-	<p>Need more packages? Take a look at the <a href="http://code.google.com/p/go-wiki/wiki/Projects">Go Projects wiki page</a>.</p>
+	<p>Need more packages? Check out the <a href="/wiki/SubRepositories">sub-repositories</a> and <a href="/wiki/Projects">other Go projects</a>.</p>
 	{{end}}
 {{end}}
diff --git a/godoc/static/static.go b/godoc/static/static.go
index f3baa8ac..b953be5f 100644
--- a/godoc/static/static.go
+++ b/godoc/static/static.go
@@ -170,7 +170,6 @@ var Files = map[string]string{
 <form method="GET" action="/search">
 <div id="menu">
 <a href="/doc/">Documents</a>
-<a href="/ref/">References</a>
 <a href="/pkg/">Packages</a>
 <a href="/project/">The Project</a>
 <a href="/help/">Help</a>
@@ -747,7 +746,7 @@ $(document).ready(function() {
 	{{end}}
 	</table>
 	{{if $.PDoc}}{{else}}
-	<p>Need more packages? Take a look at the <a href="http://code.google.com/p/go-wiki/wiki/Projects">Go Projects wiki page</a>.</p>
+	<p>Need more packages? Check out the <a href="/wiki/SubRepositories">sub-repositories</a> and <a href="/wiki/Projects">other Go projects</a>.</p>
 	{{end}}
 {{end}}
 `,
@@ -1704,9 +1703,14 @@ a#start .desc {
 	margin-top: 5px;
 }
 
-div#learn .icon {
+div#learn .popout {
 	float: right;
+	display: block;
 	cursor: pointer;
+	font-size: 12px;
+	background: url(/doc/share.png) no-repeat;
+	background-position: right top;
+	padding: 5px 27px;
 }
 div#learn pre,
 div#learn textarea {
diff --git a/godoc/static/style.css b/godoc/static/style.css
index 37b0e32c..11dbce52 100644
--- a/godoc/static/style.css
+++ b/godoc/static/style.css
@@ -283,9 +283,14 @@ a#start .desc {
 	margin-top: 5px;
 }
 
-div#learn .icon {
+div#learn .popout {
 	float: right;
+	display: block;
 	cursor: pointer;
+	font-size: 12px;
+	background: url(/doc/share.png) no-repeat;
+	background-position: right top;
+	padding: 5px 27px;
 }
 div#learn pre,
 div#learn textarea {