diff --git a/.mailmap b/.mailmap
index d13219ab..c6f6c9a8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -33,3 +33,4 @@
 <corywright@gmail.com> <cory.wright@rackspace.com>
 <ant@openstack.org> <amesserl@rackspace.com>
 <chiradeep@cloud.com> <chiradeep@chiradeep-lt2>
+<justin@fathomdb.com> <superstack@superstack.org>