diff --git a/.mailmap b/.mailmap
index 465e59311..673437d66 100644
--- a/.mailmap
+++ b/.mailmap
@@ -99,6 +99,7 @@ Joe Gordon <joe.gordon0@gmail.com> <jogo@cloudscaling.com>
 Joel Moore <joelbm24@gmail.com> Joel Moore joelbm24@gmail.com <>
 John Griffith <john.griffith@solidfire.com> john-griffith <john.griffith@solidfire.com>
 John Tran <jtran@attinteractive.com> John Tran <jhtran@att.com>
+Joshua Hesketh <josh@nitrotech.org> Joshua Hesketh <joshua.hesketh@rackspace.com>
 Justin Santa Barbara <justin@fathomdb.com> <justin@fathomdb.com>
 Justin Santa Barbara <justin@fathomdb.com> Justin SB <justin@fathomdb.com>
 Justin Santa Barbara <justin@fathomdb.com> Superstack <superstack@superstack.org>