diff --git a/.mailmap b/.mailmap
index f529fe1bb78..ea107e0abd8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,6 +6,7 @@
 #
 
 Aaron Todd <github@opprobrio.us>
+Abhishek Chanda <abhishek.becs@gmail.com> Abhishek Chanda <abhishek@cloudscaling.com>
 Ahmed Charles <ahmedcharles@gmail.com> <acharles@outlook.com>
 Alex Lyon <arcterus@mail.com> <Arcterus@mail.com>
 Alex Rønne Petersen <alex@lycus.org>
@@ -22,13 +23,16 @@ Boris Egorov <jightuse@gmail.com> <egorov@linux.com>
 Brian Anderson <banderson@mozilla.com> <andersrb@gmail.com>
 Brian Dawn <brian.t.dawn@gmail.com>
 Carl-Anton Ingmarsson <mail@carlanton.se> <ca.ingmarsson@gmail.com>
+Carol (Nichols || Goulding) <carol.nichols@gmail.com> Carol Nichols <carol.nichols@gmail.com>
 Carol Willing <carolcode@willingconsulting.com>
 Chris Pressey <cpressey@gmail.com>
 Clark Gaebel <cg.wowus.cg@gmail.com> <cgaebel@mozilla.com>
+Corey Farwell <coreyf+rust@rwell.org> Corey Farwell <coreyf@rwell.org>
 David Klein <david.klein@baesystemsdetica.com>
 David Manescu <david.manescu@gmail.com> <dman2626@uni.sydney.edu.au>
 Damien Schoof <damien.schoof@gmail.com>
 Derek Chiang <derekchiang93@gmail.com> Derek Chiang (Enchi Jiang) <derekchiang93@gmail.com>
+Diggory Hardy <diggory.hardy@gmail.com> Diggory Hardy <github@dhardy.name>
 Dylan Braithwaite <dylanbraithwaite1@gmail.com> <mail@dylanb.me>
 Eduardo Bautista <me@eduardobautista.com> <mail@eduardobautista.com>
 Eduardo Bautista <me@eduardobautista.com> <=>
@@ -44,7 +48,7 @@ Falco Hirschenberger <falco.hirschenberger@gmail.com> <hirschen@itwm.fhg.de>
 Gareth Daniel Smith <garethdanielsmith@gmail.com>
 Georges Dubus <georges.dubus@gmail.com> <georges.dubus@compiletoi.net>
 Graham Fawcett <fawcett@uwindsor.ca> <graham.fawcett@gmail.com>
-Graydon Hoare <graydon@mozilla.com> <graydon@pobox.com>
+Graydon Hoare <graydon@pobox.com> Graydon Hoare <graydon@mozilla.com>
 Heather <heather@cynede.net> <Heather@cynede.net>
 Heather <heather@cynede.net> <Cynede@Gentoo.org>
 Ilyong Cho <ilyoan@gmail.com>
@@ -58,6 +62,7 @@ Jason Orendorff <jorendorff@mozilla.com> <jason.orendorff@gmail.com>
 Jeremy Letang <letang.jeremy@gmail.com>
 Jihyun Yu <jihyun@nclab.kaist.ac.kr> jihyun <jihyun@nablecomm.com>
 Jihyun Yu <jihyun@nclab.kaist.ac.kr> <yjh0502@gmail.com>
+Johann Hofmann <mail@johann-hofmann.com> Johann <git@johann-hofmann.com> Johann Hofmann <git@johann-hofmann.com>
 John Clements <clements@racket-lang.org> <clements@brinckerhoff.org>
 Jorge Aparicio <japaric@linux.com> <japaricious@gmail.com>
 Jonathan Bailey <jbailey@mozilla.com> <jbailey@jbailey-20809.local>
@@ -86,11 +91,17 @@ Michael Williams <m.t.williams@live.com>
 Michael Woerister <michaelwoerister@gmail> <michaelwoerister@gmail.com>
 Michael Woerister <michaelwoerister@gmail> <michaelwoerister@posteo>
 Neil Pankey <npankey@gmail.com> <neil@wire.im>
+Nicholas Mazzuca <npmazzuca@gmail.com> Nicholas <npmazzuca@gmail.com>
+Ožbolt Menegatti <ozbolt.menegatti@gmail.com> gareins <ozbolt.menegatti@gmail.com>
+Peer Aramillo Irizar <peer.aramillo.irizar@gmail.com> parir <peer.aramillo.irizar@gmail.com>
 Philipp Brüschweiler <blei42@gmail.com> <blei42@gmail.com>
 Philipp Brüschweiler <blei42@gmail.com> <bruphili@student.ethz.ch>
 Pradeep Kumar <gohanpra@gmail.com>
+Przemysław Wesołek <jest@go.art.pl> Przemek Wesołek <jest@go.art.pl>
+Ralph Giles <giles@thaumas.net> Ralph Giles <giles@mozilla.com>
 Richard Diamond <wichard@vitalitystudios.com> <wichard@hahbee.co>
 Rob Arnold <robarnold@cs.cmu.edu>
+Robert Foss <dev@robertfoss.se> robertfoss <dev@robertfoss.se>
 Robert Gawdzik <rgawdzik@hotmail.com> Robert Gawdzik ☢ <rgawdzik@hotmail.com>
 Robert Millar <robert.millar@cantab.net>
 Ryan Scheel <ryan.havvy@gmail.com>
@@ -100,6 +111,7 @@ Simon Sapin <simon@exyr.org> <simon.sapin@exyr.org>
 startling <tdixon51793@gmail.com>
 Steven Fackler <sfackler@gmail.com> <sfackler@palantir.com>
 Steven Stewart-Gallus <sstewartgallus00@langara.bc.ca> <sstewartgallus00@mylangara.bc.ca>
+Tamir Duberstein <tamird@gmail.com> Tamir Duberstein <tamird@squareup.com>
 Tim Chevalier <chevalier@alum.wellesley.edu> <catamorphism@gmail.com>
 Torsten Weber <TorstenWeber12@gmail.com> <torstenweber12@gmail.com>
 William Ting <io@williamting.com> <william.h.ting@gmail.com>