diff --git a/.mailmap b/.mailmap
index 71e0734..bd36dfd 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,7 @@
-James Lu <GLolol@overdrivenetworks.com> <GLolol1@hotmail.com>
-James Lu <GLolol@overdrivenetworks.com> <GLolol@overdrive.pw>
-Ken Spencer <ken@electrocode.net> <iota@electrocode.net>
+James Lu <james@overdrivenetworks.com> <GLolol@overdrivenetworks.com>
+James Lu <james@overdrivenetworks.com> <bitflip3+github@gmail.com>
+James Lu <james@overdrivenetworks.com> <GLolol1@hotmail.com>
+James Lu <james@overdrivenetworks.com> <GLolol@overdrive.pw>
 Ken Spencer <ken@electrocode.net> <kspencer@electrocode.net>
+Ken Spencer <ken@electrocode.net> <iota@electrocode.net>
+Ken Spencer <ken@electrocode.net> <iota@e-code.in>