diff --git a/.mailmap b/.mailmap
index 1e353bbbb7..18ee4296a8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,13 @@
-Eli Barzilay        <eli@racket-lang.org>      <eli@barzilay.org>
-Kevin Tew           <tewk@racket-lang.org>     <tewk@tan.tewk.com>
-Sam Tobin-Hochstadt <samth@racket-lang.org>    <samth@punge.ccs.neu.edu>
-Vincent St-Amour    <stamourv@racket-lang.org> <stamourv@ccs.neu.edu>
+Eli Barzilay        <eli@racket-lang.org>         <eli@barzilay.org>
+Kevin Tew           <tewk@racket-lang.org>        <tewk@tan.tewk.com>
+Sam Tobin-Hochstadt <samth@racket-lang.org>       <samth@punge.ccs.neu.edu>
+Vincent St-Amour    <stamourv@racket-lang.org>    <stamourv@ccs.neu.edu>
+James Swaine        <jamesswaine@racket-lang.org> <james.swaine@gmail.com>
+Jens Axel Soegaard  <soegaard@racket-lang.org>    <jensaxel@soegaard.net>
+Matthew Flatt       <mflatt@racket-lang.org>      <mflatt@mflatt-laptop.(none)>
+Matthew Flatt       <mflatt@racket-lang.org>      <mflatt@debian.cs.utah.edu>
+Kathy Gray          <kathyg@racket-lang.org>      <kathryn.gray@cl.cam.ac.uk>
+Kathy Gray          <kathyg@racket-lang.org>      <kathyg@c0133.aw.cl.cam.ac.uk>
+Matthias Felleisen  <matthias@racket-lang.org>    <matthias@ccs.neu.edu>
+Robby Findler       <robby@racket-lang.org>       <robby@eecs.northwestern.edu>
+Jon Rafkind         <rafkind@racket-lang.org>     <jon@jon-laptop.(none)>