diff --git a/.mailmap b/.mailmap
index 1ad0a3339ab9d..32760940866d5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -184,3 +184,49 @@ Tracy Wadleigh <twadleigh@arete.com> <twadleigh@.corp.arete.com>
 Mike Innes <mike.j.innes@gmail.com>
 
 Sean Garborg <sean.garborg@gmail.com>
+
+Scott P. Jones <scottjones@alum.mit.edu> <scottjones@alum.mit.edu>
+Scott P. Jones <scottjones@alum.mit.edu> <ScottPJones@users.noreply.github.com>
+
+M. Prentis <mcprentiss@gmail.com> <mcprentiss@gmail.com>
+M. Prentis <mcprentiss@gmail.com> <mprentis@yahoo.com>
+
+Peter <peter.margo@gmx.de> <peter.margo@gmx.de>
+Peter <peter.margo@gmx.de> <https://github.com/peter1000>
+
+Rafael Fourquet <fourquet.rafael+github@gmail.com> <fourquet.rafael+github@gmail.com>
+Rafael Fourquet <fourquet.rafael+github@gmail.com> <rfourquet@users.noreply.github.com>
+
+Dan Wlasiuk <milktrader@gmail.com> <milktrader@gmail.com>
+Dan Wlasiuk <milktrader@gmail.com> <milktrader@hushmail.com>
+
+Rene Donner <rene@donner.at> <rene@donner.at>
+Rene Donner <rene@donner.at> <github@donner.at>
+
+Waldir Pimenta <waldyrious@gmail.com> <waldyrious@gmail.com>
+Waldir Pimenta <waldyrious@gmail.com> <waldir@email.com>
+
+Young Wu <doomsplayer@gmail.com> <doomsplayer@gmail.com>
+
+Daan Huybrechs <daan.huybrechs@cs.kuleuven.be> <daan.huybrechs@cs.kuleuven.be>
+
+Jey Kottalam <jey@kottalam.net> <jey@kottalam.net>
+Jey Kottalam <jey@kottalam.net> <jey@cs.berkeley.edu>
+
+John Myles White <jmw@johnmyleswhite.com> <jmw@johnmyleswhite.com>
+John Myles White <jmw@johnmyleswhite.com> <johnmyleswhite@gmail.com>
+
+Katharine Hyatt <kshyatt@physics.ucsb.edu> <kshyatt@physics.ucsb.edu>
+Katharine Hyatt <kshyatt@physics.ucsb.edu> <kshyatt@users.noreply.github.com>
+
+Oscar Blumberg <naellyn@gmail.com> <naellyn@gmail.com>
+Oscar Blumberg <naellyn@gmail.com> <oscar.blumberg@ens.fr>
+
+Seth Bromberger <seth@ncisecurity.com> <seth@ncisecurity.com>
+Seth Bromberger <seth@ncisecurity.com> <sbromberger@users.noreply.github.com>
+
+Tomas Lycken <tomas.lycken@gmail.com> <tomas.lycken@gmail.com>
+Tomas Lycken <tomas.lycken@gmail.com> <tlycken@users.noreply.github.com>
+
+Tracy Wadleigh <tracy.wadleigh@gmail.com> <tracy.wadleigh@gmail.com>
+Tracy Wadleigh <tracy.wadleigh@gmail.com> <twadleigh@arete.com>