diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5d978fb..3cd700b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,7 +8,7 @@ Join us on IRC at **#awesome-go** on freenode [web access](http://webchat.freeno
 - **To add to the list:** Submit a pull request
 - **To remove from the list:** Open an issue
 
-To set this list apart from and compliment the excellent [Go wiki Projects page](https://code.google.com/p/go-wiki/wiki/Projects), awesome-go is a specially curated list for high-quality, actively maintained Go packages and resources.
+To set this list apart from and compliment the excellent [Go wiki Projects page](https://golang.org/wiki/Projects), awesome-go is a specially curated list for high-quality, actively maintained Go packages and resources.
 
 - List items should be sorted *alphabetically*.
 - Each item should be limited to one link
diff --git a/README.md b/README.md
index 111ccee..c3467f7 100644
--- a/README.md
+++ b/README.md
@@ -753,7 +753,7 @@ Go software and plugins.
 
 ## Code Analysis
 
-* [doc](http://godoc.org/code.google.com/p/rspace.cmd/doc) - Go documentation tool that produces an alternative doc format.
+* [doc](http://godoc.org/robpike.io/cmd/doc) - Go documentation tool that produces an alternative doc format.
 * [errcheck](https://github.com/kisielk/errcheck) - Errcheck is a program for checking for unchecked errors in Go programs.
 * [gcvis](https://github.com/davecheney/gcvis) - Visualise Go program GC trace data in real time.
 * [Go Metalinter](https://github.com/alecthomas/gometalinter) - Metalinter is a tool to automatically apply all static analysis tool and report their output in normalized form.