diff --git a/.mailmap b/.mailmap
index 25c76d0..6c1d7d1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,14 +1,29 @@
-Brandon S Allbery KF8NH <allbery.b@gmail.com> <allbery.b@gmail.com>
+Adam Plaice <plaice.adam+github@gmail.com>
+Brandon S Allbery KF8NH <allbery.b@gmail.com>
 Brent Yorgey <byorgey@gmail.com> <byorgey@cis.upenn.edu>
+Conrad Irwin <conrad.irwin@gmail.com>
 Daniel Schoepe <daniel.schoepe@gmail.com> <asgaroth_@gmx.de>
 Daniel Wagner <me@dmwit.com> <daniel@wagner-home.com>
+David Glasser <glasser@mit.edu>
+Deven Lahoti <deven.lahoti@gmail.com>
 Don Stewart <dons00@gmail.com> <dons@cse.unsw.edu.au>
 Don Stewart <dons00@gmail.com> <dons@galois.com>
-Gwern Branwen <gwern0@gmail.com> <gwern0@gmail.com>
+Gwern Branwen <gwern@gwern.net> <gwern0@gmail.com>
 Lukas Mai <l.mai@web.de> <l.mai@web.de>
-Michael G. Sloan <mgsloan@gmail.com> <mgsloan@gmail.com>
+Marshall Lochbaum <mwlochbaum@gmail.com>
+Michael G. Sloan <mgsloan@gmail.com>
 Neil Mitchell <ndmitchell@gmail.com> <http://www.cs.york.ac.uk/~ndm/>
 Neil Mitchell <ndmitchell@gmail.com> Neil Mitchell <unknown>
-Peter Jones <pjones@devalot.com> <pjones@pmade.com>
+Nick Burlett <nickburlett@mac.com>
+Nicolas Pouillard <nicolas.pouillard@gmail.com>
+Nik Nyby <nnyby@columbia.edu>
+Peter J. Jones <pjones@devalot.com>
+Peter J. Jones <pjones@devalot.com> <pjones@pmade.com>
+Robert Marlow <bobstopper@bobturf.org>
+Robert Marlow <bobstopper@bobturf.org> <robreim@bobturf.org>
+Sam Hughes <hughes@rpi.edu>
+Shae Erisson <shae@ScannedInAvian.com>
 Spencer Janssen <spencerjanssen@gmail.com> <sjanssen@cse.unl.edu>
+Timothy Hobbs <tim.thelion@gmail.com>
 Vanessa McHale <vamchale@gmail.com> <vanessa.mchale@reconfigure.io>
+Wirt Wolff <wirtwolff@gmail.com>