diff --git a/.mailmap b/.mailmap
index f5201458039..52f7877242e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -98,8 +98,8 @@ Tim Caswell <tim@creationix.com> <tim@0-26-8-e9-4c-e1.dyn.utdallas.edu>
 Tim Price <timprice@mangoraft.com>
 Tim Smart <timehandgod@gmail.com> <tim@fostle.com>
 Tim Smart <timehandgod@gmail.com> <timehandgod@gmail.com>
-Tom Hughes-Croucher <tom.hughes@palm.com>
-Tom Hughes-Croucher <tom.hughes@palm.com> <tom_croucher@yahoo.com>
+Tom Hughes <tom.hughes@palm.com> <tomtheengineer@gmail.com>
+Tom Hughes-Croucher <tom_croucher@yahoo.com>
 Trevor Burnham <trevor@databraid.com> <trevorburnham@gmail.com>
 Tyler Larson <talltyler@gmail.com>
 Vincent Voyer <v@fasterize.com>
diff --git a/AUTHORS b/AUTHORS
index 5aa6137928e..bc4c9c6fd2c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -124,7 +124,8 @@ Sam Stephenson <sam@37signals.com>
 Jorge Chamorro Bieling <jorge@jorgechamorro.com>
 Evan Larkin <evan.larkin.il.com>
 Sean Coates <sean@seancoates.com>
-Tom Hughes-Croucher <tom.hughes@palm.com>
+Tom Hughes <tom.hughes@palm.com> <tomtheengineer@gmail.com>
+Tom Hughes-Croucher <tom_croucher@yahoo.com>
 Joshua Peek <josh@joshpeek.com>
 Nathan Rajlich <nathan@tootallnate.net>
 Peteris Krumins <peteris.krumins@gmail.com>