diff --git a/.mailmap b/.mailmap
index babf5ed317..864d2e8abe 100644
--- a/.mailmap
+++ b/.mailmap
@@ -36,9 +36,13 @@ Gregory Cooper    <ghcooper@gmail.com>
 Gregory Cooper    <ghcooper@gmail.com>         <greg@cs.brown.edu>
 J. Ian Johnson    <ianj@ccs.neu.edu>           <ianj@bubbles.ccs.neu.edu>
 J. Ian Johnson    <ianj@ccs.neu.edu>           <ianj@moonpatrol.ccs.neu.edu>
-Michael Wilber    <wilmic1102@gmail.com>       <gcr@sneakygcr.net>
+Kimberly Wilber    <kimmy@kjwilber.org>       <gcr@sneakygcr.net>
+Kimberly Wilber     <kimmy@kjwilber.org>      <wilmic1102@gmail.com>
 Michael Filonenko <filonenko.mikhail@gmail.com> <mfilonenko@ipa.nw.ru>
 Rodolfo Carvalho  <rhcarvalho@gmail.com>
 Steven Jaconette  <jacones@u.northwestern.edu> <stevenjaconette2007@u.northwestern.edu>
 Tim Brown         <tim@timb.net>               <tim.brown@cityc.co.uk>
 Marc Burns <m4burns@uwaterloo.ca> Marc Burns <marc@localhost.localdomain>
+Alexander McLin <alex.mclin@gmail.com>    <abmclin@users.noreply.github.com>
+Alexander McLin <alex.mclin@gmail.com>    <abm@automaton.win.ad.jhu.edu>
+Alexander McLin <alex.mclin@gmail.com>   Alexander B. McLin <alex.mclin@gmail.com>