diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..15167cd
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,3 @@
+# This source code refers to The Go Authors for copyright purposes.
+# The master list of authors is in the main Go distribution,
+# visible at http://tip.golang.org/AUTHORS.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c0926a2..1c4577e 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,17 +1,3 @@
-# This is a list of contributors to the Go protobuf repository.
-
-# Names should be added to this file like so:
-#     Name <email address>
-
-# Please keep the list sorted.
-
-
-Dave Cheney <dave@cheney.net>
-David Symonds <dsymonds@golang.org>
-Jeff Hodges <jeff@somethingsimilar.com>
-Jonathan Hseu <jhseu@google.com>
-Ken Thompson <ken@golang.org>
-Mikkel Krautz <mikkel@krautz.dk> <krautz@gmail.com>
-Nigel Tao <nigeltao@golang.org>
-Rob Pike <r@golang.org>
-Russ Cox <rsc@golang.org>
+# This source code was written by the Go contributors.
+# The master list of contributors is in the main Go distribution,
+# visible at http://tip.golang.org/CONTRIBUTORS.
diff --git a/LICENSE b/LICENSE
index ae3664f..d4d4258 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 Go support for Protocol Buffers - Google's data interchange format
 
-Copyright 2010 Google Inc.  All rights reserved.
+Copyright 2010 The Go Authors.  All rights reserved.
 http://code.google.com/p/goprotobuf/
 
 Redistribution and use in source and binary forms, with or without
diff --git a/Make.protobuf b/Make.protobuf
index b558679..0b0ff0c 100644
--- a/Make.protobuf
+++ b/Make.protobuf
@@ -1,6 +1,6 @@
 # Go support for Protocol Buffers - Google's data interchange format
 #
-# Copyright 2010 Google Inc.  All rights reserved.
+# Copyright 2010 The Go Authors.  All rights reserved.
 # http://code.google.com/p/goprotobuf/
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/Makefile b/Makefile
index c24b158..b1b24e3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Go support for Protocol Buffers - Google's data interchange format
 #
-# Copyright 2010 Google Inc.  All rights reserved.
+# Copyright 2010 The Go Authors.  All rights reserved.
 # http://code.google.com/p/goprotobuf/
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/README b/README
index 997a1e6..f9bd250 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 Go support for Protocol Buffers - Google's data interchange format
-Copyright 2010 Google Inc.
+Copyright 2010 The Go Authors.
 http://code.google.com/p/goprotobuf/
 
 This software implements Go bindings for protocol buffers.  For
diff --git a/lib/codereview/codereview.cfg b/lib/codereview/codereview.cfg
index 93b55c0..e3eb47c 100644
--- a/lib/codereview/codereview.cfg
+++ b/lib/codereview/codereview.cfg
@@ -1 +1,2 @@
 defaultcc: golang-dev@googlegroups.com
+contributors: http://go.googlecode.com/hg/CONTRIBUTORS
diff --git a/proto/Makefile b/proto/Makefile
index 94e8d19..e99b839 100644
--- a/proto/Makefile
+++ b/proto/Makefile
@@ -1,6 +1,6 @@
 # Go support for Protocol Buffers - Google's data interchange format
 #
-# Copyright 2010 Google Inc.  All rights reserved.
+# Copyright 2010 The Go Authors.  All rights reserved.
 # http://code.google.com/p/goprotobuf/
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/proto/all_test.go b/proto/all_test.go
index 0ff57fd..5024905 100644
--- a/proto/all_test.go
+++ b/proto/all_test.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/proto/clone.go b/proto/clone.go
index 71c0f52..a5ae9ce 100644
--- a/proto/clone.go
+++ b/proto/clone.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2011 Google Inc.  All rights reserved.
+// Copyright 2011 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/proto/clone_test.go b/proto/clone_test.go
index 5005542..26bf0e7 100644
--- a/proto/clone_test.go
+++ b/proto/clone_test.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2011 Google Inc.  All rights reserved.
+// Copyright 2011 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/proto/decode.go b/proto/decode.go
index e7f5076..f84d465 100644
--- a/proto/decode.go
+++ b/proto/decode.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/proto/encode.go b/proto/encode.go
index b3c9e45..288fb9c 100644
--- a/proto/encode.go
+++ b/proto/encode.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/proto/equal.go b/proto/equal.go
index 11ea6ed..50f20d4 100644
--- a/proto/equal.go
+++ b/proto/equal.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2011 Google Inc.  All rights reserved.
+// Copyright 2011 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/proto/equal_test.go b/proto/equal_test.go
index 574e52e..cdf3fd9 100644
--- a/proto/equal_test.go
+++ b/proto/equal_test.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2011 Google Inc.  All rights reserved.
+// Copyright 2011 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/proto/extensions.go b/proto/extensions.go
index 56e04ce..9ff1968 100644
--- a/proto/extensions.go
+++ b/proto/extensions.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/proto/lib.go b/proto/lib.go
index 9c0f2b4..57251a7 100644
--- a/proto/lib.go
+++ b/proto/lib.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/proto/message_set.go b/proto/message_set.go
index 0571c6e..e9474b8 100644
--- a/proto/message_set.go
+++ b/proto/message_set.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/proto/pointer_reflect.go b/proto/pointer_reflect.go
index 183ca7d..796bfc9 100644
--- a/proto/pointer_reflect.go
+++ b/proto/pointer_reflect.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2012 Google Inc.  All rights reserved.
+// Copyright 2012 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/proto/pointer_unsafe.go b/proto/pointer_unsafe.go
index 817b084..2d102cf 100644
--- a/proto/pointer_unsafe.go
+++ b/proto/pointer_unsafe.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2012 Google Inc.  All rights reserved.
+// Copyright 2012 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/proto/properties.go b/proto/properties.go
index ce6b0d8..72e6b21 100644
--- a/proto/properties.go
+++ b/proto/properties.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/proto/size.go b/proto/size.go
index 567ec96..201bd67 100644
--- a/proto/size.go
+++ b/proto/size.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2012 Google Inc.  All rights reserved.
+// Copyright 2012 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/proto/size2_test.go b/proto/size2_test.go
index 0183256..55902a4 100644
--- a/proto/size2_test.go
+++ b/proto/size2_test.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2012 Google Inc.  All rights reserved.
+// Copyright 2012 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/proto/size_test.go b/proto/size_test.go
index 31aaf54..6774d39 100644
--- a/proto/size_test.go
+++ b/proto/size_test.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2012 Google Inc.  All rights reserved.
+// Copyright 2012 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/proto/testdata/Makefile b/proto/testdata/Makefile
index 685c482..9fa10e4 100644
--- a/proto/testdata/Makefile
+++ b/proto/testdata/Makefile
@@ -1,6 +1,6 @@
 # Go support for Protocol Buffers - Google's data interchange format
 #
-# Copyright 2010 Google Inc.  All rights reserved.
+# Copyright 2010 The Go Authors.  All rights reserved.
 # http://code.google.com/p/goprotobuf/
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/proto/testdata/golden_test.go b/proto/testdata/golden_test.go
index ed0a86d..f614aa1 100644
--- a/proto/testdata/golden_test.go
+++ b/proto/testdata/golden_test.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2013 Google Inc.  All rights reserved.
+// Copyright 2012 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/proto/testdata/test.proto b/proto/testdata/test.proto
index 14b274e..0154940 100644
--- a/proto/testdata/test.proto
+++ b/proto/testdata/test.proto
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/proto/text.go b/proto/text.go
index 8fd881c..507c214 100644
--- a/proto/text.go
+++ b/proto/text.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/proto/text_parser.go b/proto/text_parser.go
index 1f170bf..3c79876 100644
--- a/proto/text_parser.go
+++ b/proto/text_parser.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/proto/text_parser_test.go b/proto/text_parser_test.go
index ce058f4..7ae0759 100644
--- a/proto/text_parser_test.go
+++ b/proto/text_parser_test.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/proto/text_test.go b/proto/text_test.go
index 97a7c70..948b11e 100644
--- a/proto/text_test.go
+++ b/proto/text_test.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/protoc-gen-go/Makefile b/protoc-gen-go/Makefile
index 665dbfa..80530f4 100644
--- a/protoc-gen-go/Makefile
+++ b/protoc-gen-go/Makefile
@@ -1,6 +1,6 @@
 # Go support for Protocol Buffers - Google's data interchange format
 #
-# Copyright 2010 Google Inc.  All rights reserved.
+# Copyright 2010 The Go Authors.  All rights reserved.
 # http://code.google.com/p/goprotobuf/
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/protoc-gen-go/descriptor/Makefile b/protoc-gen-go/descriptor/Makefile
index cc8d4f5..e8b454f 100644
--- a/protoc-gen-go/descriptor/Makefile
+++ b/protoc-gen-go/descriptor/Makefile
@@ -1,6 +1,6 @@
 # Go support for Protocol Buffers - Google's data interchange format
 #
-# Copyright 2010 Google Inc.  All rights reserved.
+# Copyright 2010 The Go Authors.  All rights reserved.
 # http://code.google.com/p/goprotobuf/
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/protoc-gen-go/doc.go b/protoc-gen-go/doc.go
index f84ff8e..d678763 100644
--- a/protoc-gen-go/doc.go
+++ b/protoc-gen-go/doc.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/protoc-gen-go/generator/Makefile b/protoc-gen-go/generator/Makefile
index 8903771..f6c954d 100644
--- a/protoc-gen-go/generator/Makefile
+++ b/protoc-gen-go/generator/Makefile
@@ -1,6 +1,6 @@
 # Go support for Protocol Buffers - Google's data interchange format
 #
-# Copyright 2010 Google Inc.  All rights reserved.
+# Copyright 2010 The Go Authors.  All rights reserved.
 # http://code.google.com/p/goprotobuf/
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/protoc-gen-go/generator/generator.go b/protoc-gen-go/generator/generator.go
index 7bf7b39..ce90a15 100644
--- a/protoc-gen-go/generator/generator.go
+++ b/protoc-gen-go/generator/generator.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/protoc-gen-go/main.go b/protoc-gen-go/main.go
index 7d00361..1700dff 100644
--- a/protoc-gen-go/main.go
+++ b/protoc-gen-go/main.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/protoc-gen-go/plugin/Makefile b/protoc-gen-go/plugin/Makefile
index b89854c..cc92562 100644
--- a/protoc-gen-go/plugin/Makefile
+++ b/protoc-gen-go/plugin/Makefile
@@ -1,6 +1,6 @@
 # Go support for Protocol Buffers - Google's data interchange format
 #
-# Copyright 2010 Google Inc.  All rights reserved.
+# Copyright 2010 The Go Authors.  All rights reserved.
 # http://code.google.com/p/goprotobuf/
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/protoc-gen-go/testdata/Makefile b/protoc-gen-go/testdata/Makefile
index 1ef7f60..33acc50 100644
--- a/protoc-gen-go/testdata/Makefile
+++ b/protoc-gen-go/testdata/Makefile
@@ -1,6 +1,6 @@
 # Go support for Protocol Buffers - Google's data interchange format
 #
-# Copyright 2010 Google Inc.  All rights reserved.
+# Copyright 2010 The Go Authors.  All rights reserved.
 # http://code.google.com/p/goprotobuf/
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/protoc-gen-go/testdata/extension_base.proto b/protoc-gen-go/testdata/extension_base.proto
index bb35b74..3510982 100644
--- a/protoc-gen-go/testdata/extension_base.proto
+++ b/protoc-gen-go/testdata/extension_base.proto
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/protoc-gen-go/testdata/extension_extra.proto b/protoc-gen-go/testdata/extension_extra.proto
index 08b949b..a6ce774 100644
--- a/protoc-gen-go/testdata/extension_extra.proto
+++ b/protoc-gen-go/testdata/extension_extra.proto
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2011 Google Inc.  All rights reserved.
+// Copyright 2011 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/protoc-gen-go/testdata/extension_test.go b/protoc-gen-go/testdata/extension_test.go
index 5f1be00..60e75b6 100644
--- a/protoc-gen-go/testdata/extension_test.go
+++ b/protoc-gen-go/testdata/extension_test.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/protoc-gen-go/testdata/extension_user.proto b/protoc-gen-go/testdata/extension_user.proto
index 3f84b48..90e3c92 100644
--- a/protoc-gen-go/testdata/extension_user.proto
+++ b/protoc-gen-go/testdata/extension_user.proto
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/protoc-gen-go/testdata/golden_test.go b/protoc-gen-go/testdata/golden_test.go
index f645206..a2cba65 100644
--- a/protoc-gen-go/testdata/golden_test.go
+++ b/protoc-gen-go/testdata/golden_test.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2013 Google Inc.  All rights reserved.
+// Copyright 2012 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/protoc-gen-go/testdata/imp.proto b/protoc-gen-go/testdata/imp.proto
index 3f116a2..9767a0d 100644
--- a/protoc-gen-go/testdata/imp.proto
+++ b/protoc-gen-go/testdata/imp.proto
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/protoc-gen-go/testdata/imp2.proto b/protoc-gen-go/testdata/imp2.proto
index e69870a..62dad2b 100644
--- a/protoc-gen-go/testdata/imp2.proto
+++ b/protoc-gen-go/testdata/imp2.proto
@@ -1,5 +1,5 @@
 //
-// Copyright 2011 Google Inc.  All rights reserved.
+// Copyright 2011 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/protoc-gen-go/testdata/imp3.proto b/protoc-gen-go/testdata/imp3.proto
index 18a9615..9213369 100644
--- a/protoc-gen-go/testdata/imp3.proto
+++ b/protoc-gen-go/testdata/imp3.proto
@@ -1,5 +1,5 @@
 //
-// Copyright 2012 Google Inc.  All rights reserved.
+// Copyright 2012 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/protoc-gen-go/testdata/main_test.go b/protoc-gen-go/testdata/main_test.go
index 8a2a75f..7bc74cb 100644
--- a/protoc-gen-go/testdata/main_test.go
+++ b/protoc-gen-go/testdata/main_test.go
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/protoc-gen-go/testdata/multi/multi1.proto b/protoc-gen-go/testdata/multi/multi1.proto
index 0ac4cae..86bcc2b 100644
--- a/protoc-gen-go/testdata/multi/multi1.proto
+++ b/protoc-gen-go/testdata/multi/multi1.proto
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/protoc-gen-go/testdata/multi/multi2.proto b/protoc-gen-go/testdata/multi/multi2.proto
index 8957f35..bf0ec47 100644
--- a/protoc-gen-go/testdata/multi/multi2.proto
+++ b/protoc-gen-go/testdata/multi/multi2.proto
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/protoc-gen-go/testdata/multi/multi3.proto b/protoc-gen-go/testdata/multi/multi3.proto
index 4d860c6..070e7f8 100644
--- a/protoc-gen-go/testdata/multi/multi3.proto
+++ b/protoc-gen-go/testdata/multi/multi3.proto
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without
diff --git a/protoc-gen-go/testdata/my_test/test.proto b/protoc-gen-go/testdata/my_test/test.proto
index b43939f..0efc6b2 100644
--- a/protoc-gen-go/testdata/my_test/test.proto
+++ b/protoc-gen-go/testdata/my_test/test.proto
@@ -1,6 +1,6 @@
 // Go support for Protocol Buffers - Google's data interchange format
 //
-// Copyright 2010 Google Inc.  All rights reserved.
+// Copyright 2010 The Go Authors.  All rights reserved.
 // http://code.google.com/p/goprotobuf/
 //
 // Redistribution and use in source and binary forms, with or without