diff --git a/README b/README
index 599f4f77..73a04616 100644
--- a/README
+++ b/README
@@ -6,16 +6,16 @@ This package and the code it generates requires at least Go 1.2.
 
 This software implements Go bindings for protocol buffers.  For
 information about protocol buffers themselves, see
-	http://code.google.com/apis/protocolbuffers/
+	https://developers.google.com/protocol-buffers/
 To use this software, you must first install the standard C++
 implementation of protocol buffers from
-	http://code.google.com/p/protobuf/
+	https://developers.google.com/protocol-buffers/
 And of course you must also install the Go compiler and tools from
-	http://code.google.com/p/go/
+	https://golang.org/
 See
-	http://golang.org/doc/install.html
+	https://golang.org/doc/install
 for details or, if you are using gccgo, follow the instructions at
-	http://golang.org/doc/gccgo_install.html
+	https://golang.org/doc/install/gccgo
 
 This software has two parts: a 'protocol compiler plugin' that
 generates Go source files that, once compiled, can access and manage
diff --git a/proto/encode.go b/proto/encode.go
index 026f9315..cbe4242e 100644
--- a/proto/encode.go
+++ b/proto/encode.go
@@ -950,7 +950,7 @@ func (o *Buffer) enc_struct(prop *StructProperties, base structPointer) error {
 	var state errorState
 	// Encode fields in tag order so that decoders may use optimizations
 	// that depend on the ordering.
-	// http://code.google.com/apis/protocolbuffers/docs/encoding.html#order
+	// https://developers.google.com/protocol-buffers/docs/encoding#order
 	for _, i := range prop.order {
 		p := prop.Prop[i]
 		if p.enc != nil {
diff --git a/protoc-gen-go/descriptor/Makefile b/protoc-gen-go/descriptor/Makefile
index 1d7db6db..9faf8086 100644
--- a/protoc-gen-go/descriptor/Makefile
+++ b/protoc-gen-go/descriptor/Makefile
@@ -29,11 +29,11 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Not stored here, but descriptor.proto is in http://code.google.com/p/protobuf
-# at protobuf-2.5.0/src/google/protobuf/descriptor.proto
+# Not stored here, but descriptor.proto is in https://github.com/google/protobuf/
+# at src/google/protobuf/descriptor.proto
 regenerate:
 	echo WARNING! THIS RULE IS PROBABLY NOT RIGHT FOR YOUR INSTALLATION
-	cd $(HOME)/src/protobuf-2.5.0/src && \
+	cd $(HOME)/src/protobuf/src && \
 	protoc --go_out=. ./google/protobuf/descriptor.proto && \
 	sed -i 's,^package google_protobuf,package descriptor,' google/protobuf/descriptor.pb.go && \
 	cp ./google/protobuf/descriptor.pb.go $(GOPATH)/src/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
diff --git a/protoc-gen-go/doc.go b/protoc-gen-go/doc.go
index 3d5c588a..0d6055d6 100644
--- a/protoc-gen-go/doc.go
+++ b/protoc-gen-go/doc.go
@@ -45,7 +45,7 @@
 	the library.
 
 	See the README and documentation for protocol buffers to learn more:
-		http://code.google.com/p/protobuf/
+		https://developers.google.com/protocol-buffers/
 
 */
 package documentation
diff --git a/protoc-gen-go/plugin/Makefile b/protoc-gen-go/plugin/Makefile
index 136d943d..86d1d273 100644
--- a/protoc-gen-go/plugin/Makefile
+++ b/protoc-gen-go/plugin/Makefile
@@ -29,12 +29,12 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Not stored here, but plugin.proto is in http://code.google.com/p/protobuf
-# at protobuf-2.5.0/src/google/protobuf/compiler/plugin.proto
+# Not stored here, but plugin.proto is in https://github.com/google/protobuf/
+# at src/google/protobuf/compiler/plugin.proto
 # Also we need to fix an import.
 regenerate:
 	echo WARNING! THIS RULE IS PROBABLY NOT RIGHT FOR YOUR INSTALLATION
-	cd $(HOME)/src/protobuf-2.5.0/src && \
+	cd $(HOME)/src/protobuf/src && \
 	protoc --go_out=. ./google/protobuf/compiler/plugin.proto && \
 	cat ./google/protobuf/compiler/plugin.pb.go | \
 		sed '/^import/s;google/protobuf/descriptor.pb;github.com/golang/protobuf/protoc-gen-go/descriptor;' > $(GOPATH)/src/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go