diff --git a/AUTHORS b/AUTHORS
index 15167cd..3801eee 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,13 @@
 # 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.
+
+# This file is here to keep codereview happy.
+
+# Names should be added to this file as
+#	Name or Organization <email address>
+# The email address is not required for organizations.
+
+# Please keep the list sorted.
+
+Google Inc.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 1c4577e..db52075 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,3 +1,13 @@
 # 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.
+
+# This file is here to keep coderview happy.
+
+# Names should be added to this file like so:
+#     Name <email address>
+
+# Please keep the list sorted.
+
+Nigel Tao <nigeltao@golang.org>
+Rob Pike <r@golang.org>
diff --git a/lib/codereview/codereview.cfg b/lib/codereview/codereview.cfg
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lib/codereview/codereview.cfg