diff --git a/.mailmap b/.mailmap
index cf26f1df..376fd583 100644
--- a/.mailmap
+++ b/.mailmap
@@ -17,3 +17,4 @@ Roberto Alanis <alanisbaez@google.com>
 Brian Ledger <brianpl@google.com>
 Maryla Ustarroz-Calonge <maryla@google.com>
 Yannis Guyon <yguyon@google.com>
+Henner Zeller <hzeller@google.com> <h.zeller@acm.org>
diff --git a/AUTHORS b/AUTHORS
index 6772bcd1..6fe9552c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,9 +10,11 @@ Contributors:
 - Christian Duvivier (cduvivier at google dot com)
 - Christopher Degawa (ccom at randomderp dot com)
 - Clement Courbet (courbet at google dot com)
+- devtools-clrobot at google dot com (devtools-clrobot@google dot com)
 - Djordje Pesut (djordje dot pesut at imgtec dot com)
 - Frank (1433351828 at qq dot com)
 - Frank Barchard (fbarchard at google dot com)
+- Henner Zeller (hzeller at google dot com)
 - Hui Su (huisu at google dot com)
 - H. Vetinari (h dot vetinari at gmx dot com)
 - Ilya Kurdyukov (jpegqs at gmail dot com)