diff --git a/.mailmap b/.mailmap
index 5272472d483b38a55a97fe4d834801617f9f5921..edfb75ec5fe58b269e63111fc0a85dd0df3bcecc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -80,6 +80,7 @@ Krasimir Angelov            <kr.angelov@gmail.com>
 Krasimir Angelov            <kr.angelov@gmail.com>                 ka2_mail <ka2_mail@yahoo.com>
 Lennart Kolmodin            <kolmodin@gmail.com>                   <kolmodin@dtek.chalmers.se>
 Lennart Kolmodin            <kolmodin@gmail.com>                   <kolmodin@gentoo.org>
+Lennart Kolmodin            <kolmodin@gmail.com>                   <kolmodin@google.com>
 Lennart Spitzner            <lsp@informatik.uni-kiel.de>
 Malcolm Wallace             <Malcolm.Wallace@me.com>               Malcolm.Wallace <Malcolm.Wallace@cs.york.ac.uk>
 Mark Weber                  <marco-oweber@gmx.de>                  marco-oweber <marco-oweber@gmx.de>
diff --git a/AUTHORS b/AUTHORS
index 7a2ecfcd93680cdcc9a5e6464d670c10ba36518e..200f2742df86afa91a62e087e83a89119622cb03 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -237,6 +237,7 @@ Thomas Schilling         <nominolo@gmail.com>
 Thomas Tuegel            <ttuegel@gmail.com>
 Tillmann Rendel          <rendel@informatik.uni-marburg.de>
 Tim Chevalier            <chevalier@alum.wellesley.edu>
+Tim Humphries            <tim.humphries@ambiata.com>
 Tomas Vestelind          <tomas.vestelind@gmail.com>
 Toshio Ito               <debug.ito@gmail.com>
 Travis Cardwell          <travis.cardwell@extellisys.com>