diff --git a/AUTHORS b/AUTHORS
index 63ecb9ac423..3dd332b6743 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -13,6 +13,7 @@ Aron Nopanen <aron.nopanen@gmail.com>
 David G. Andersen <dave.andersen@gmail.com>
 David Titarenco <david.titarenco@gmail.com>
 Devon H. O'Dell <devon.odell@gmail.com>
+Evan Shaw <chickencha@gmail.com>
 Josh Goebel <dreamer3@gmail.com>
 Google Inc.
 Kevin Ballard <kevin@sb.org>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7f9de1a936f..cc5f4765300 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -39,6 +39,7 @@ David G. Andersen <dave.andersen@gmail.com>
 David Symonds <dsymonds@golang.org>
 David Titarenco <david.titarenco@gmail.com>
 Devon H. O'Dell <devon.odell@gmail.com>
+Evan Shaw <chickencha@gmail.com>
 Ian Lance Taylor <iant@golang.org>
 Ivan Krasin <krasin@golang.org>
 Jacob Baskin <jbaskin@google.com>