diff --git a/.mailmap b/.mailmap
index aaa2c90..df6e893 100644
--- a/.mailmap
+++ b/.mailmap
@@ -8,3 +8,8 @@
 
 Adam Ross <aross@phase2technology.com> Grayside <aross@phase2technology.com>
 Adam Ross <aross@phase2technology.com> Grayside <grayside@gmail.com>
+Adam Ross <aross@phase2technology.com> Adam Ross <grayside@gmail.com>
+Chris Johnson <cjohnson@phase2technology.com> Chris Johnson <git@tekante.com>
+Dave Murray <dmurray@phase2technology.com> David Murray <dmurray@phase2technology.com>
+Frank Febbraro <frank@phase2technology.com> Frank Febbraro <frankfebbraro@gmail.com>
+Tanner Heffner <theffner@phase2technology.com> tjheffner <tannerjheffner@gmail.com>