diff --git a/.mailmap b/.mailmap
index 6a1eb7687d..a2976a4b3e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -25,8 +25,8 @@ wchen-r7 <wchen-r7@github>         sinn3r <wei_chen@rapid7.com>
 # periodically. If you're on this list and would like to not be, just
 # let todb@metasploit.com know.
 
-Brandon Perry <bperry.volatile@gmail.com> Brandon Perry <bperry.volatile@gmail.com>
-Brandon Perry <bperry.volatile@gmail.com> Brandon Perry <bperry@bperry-rapid7.(none)>
+Brandon Perry <brandonprry@github>     Brandon Perry <bperry.volatile@gmail.com>
+Brandon Perry <brandonprry@github>     Brandon Perry <bperry@bperry-rapid7.(none)>
 Brian Wallace <bwall@github>           (B)rian (Wall)ace <nightstrike9809@gmail.com>
 Brian Wallace <bwall@github>           Brian Wallace <bwall@openbwall.com>
 ChrisJohnRiley <ChrisJohnRiley@github> Chris John Riley <chris.riley@c22.cc>
@@ -37,9 +37,9 @@ Meatballs1 <Meatballs1@github>         Meatballs <eat_meatballs@hotmail.co.uk>
 Meatballs1 <Meatballs1@github>         Meatballs1 <eat_meatballs@hotmail.co.uk> 
 bannedit <bannedit@github>             David Rude <bannedit0@gmail.com>
 ceballosm <ceballosm@github>           Mario Ceballos <mc@metasploit.com>
-chao-mu <chao.mu@minorcrash.com>       Chao Mu <chao.mu@minorcrash.com>
-chao-mu <chao.mu@minorcrash.com>       chao-mu <chao.mu@minorcrash.com>
-chao-mu <chao.mu@minorcrash.com>       chao-mu <chao@confusion.(none)>
+Chao-mu <Chao-Mu@github>               Chao Mu <chao.mu@minorcrash.com>
+Chao-mu <Chao-Mu@github>               chao-mu <chao.mu@minorcrash.com>
+Chao-mu <Chao-Mu@github>               chao-mu <chao@confusion.(none)>
 corelanc0d3er <corelanc0d3er@github>   Peter Van Eeckhoutte (corelanc0d3r) <peter.ve@corelan.be>
 corelanc0d3er <corelanc0d3er@github>   corelanc0d3r <peter.ve@corelan.be>
 darkoperator <darkoperator@github>     Carlos Perez <carlos_perez@darkoperator.com>