diff --git a/.mailmap b/.mailmap
index e11a64ac9d..485fa108bd 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,3 +1,4 @@
+# Core racket-lang.org people
 Eli Barzilay        <eli@racket-lang.org>         <eli@barzilay.org>
 Eli Barzilay        <eli@racket-lang.org>         <eli@plt-racket.org>
 Kevin Tew           <tewk@racket-lang.org>        <tewk@tan.tewk.com>
@@ -20,5 +21,17 @@ Asumu Takikawa      <asumu@racket-lang.org>       <asumu@ccs.neu.edu>
 Asumu Takikawa      <asumu@racket-lang.org>       <asumu@interchange.ubc.ca>
 Guillaume Marceau   <gmarceau@racket-lang.org>    <gmarceau@gmail.com>
 Danny Yoo           <dyoo@racket-lang.org>        <dyoo@cs.wpi.edu>
+Danny Yoo           <dyoo@racket-lang.org>        <dyoo@hashcollision.org>
 Philippe Meunier    <meunier@racket-lang.org>     <meunier@git.racket-lang.org>
 David Van Horn      <dvanhorn@racket-lang.org>    <dvanhorn@ccs.neu.edu>
+
+# Additional people
+Eric Dobson      <eric.n.dobson@gmail.com>    <endobson@cs.brown.edu>
+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   <gcr@sneakygcr.net>
+Rodolfo Carvalho <rhcarvalho@gmail.com>
+Steven Jaconette <jacones@u.northwestern.edu> <stevenjaconette2007@u.northwestern.edu>
+Marc Burns <m4burns@uwaterloo.ca> Marc Burns <marc@localhost.localdomain>