diff --git a/AUTHORS b/AUTHORS
index 3577cd92b60..b41da7dc96f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -37,6 +37,7 @@ Fazlul Shahriar <fshahriar@gmail.com>
 Firmansyah Adiputra <frm.adiputra@gmail.com>
 Giles Lean <giles.lean@pobox.com>
 Google Inc.
+Gustavo Niemeyer <gustavo@niemeyer.net>
 Hector Chu <hectorchu@gmail.com>
 Icarus Sparry <golang@icarus.freeuk.com>
 Isaac Wagner <ibw@isaacwagner.me>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 68c5934137f..caa4fb3583b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -65,6 +65,7 @@ Fazlul Shahriar <fshahriar@gmail.com>
 Firmansyah Adiputra <frm.adiputra@gmail.com>
 Fumitoshi Ukai <ukai@google.com>
 Giles Lean <giles.lean@pobox.com>
+Gustavo Niemeyer <gustavo@niemeyer.net> <n13m3y3r@gmail.com>
 Hector Chu <hectorchu@gmail.com>
 Ian Lance Taylor <iant@golang.org>
 Icarus Sparry <golang@icarus.freeuk.com>