diff --git a/.mailmap b/.mailmap
index 3725f7d3fb547..040be2e5cc956 100644
--- a/.mailmap
+++ b/.mailmap
@@ -4,9 +4,11 @@ Christoph Pojer <christoph.pojer@gmail.com>
 Christoph Pojer <christoph.pojer@gmail.com> <cpojer@fb.com>
 Connor McSheffrey <c@conr.me> <connor.mcsheffrey@gmail.com>
 Dan Schafer <dschafer@fb.com>
+Evan Coonrod <evan@paloalto.com>
 Fabio M. Costa <fabiomcosta@gmail.com> <fabs@fb.com>
 Harry Hull <harry.hull1@gmail.com>
 Ingvar Stepanyan <me@rreverser.com> <rreverser@ubuntu.rreverser.a4.internal.cloudapp.net>
+Jaime Mingo <j.mingov@3boll.com>
 Jason Bonta <jbonta@gmail.com> <jasonbonta@fb.com>
 Jason Trill <jason@jasontrill.com>
 Jeff Morrison <jeff@anafx.com> <Jeff@anafx.com>
@@ -18,6 +20,7 @@ Jordan Walke <jordojw@gmail.com> <jordanjcw@fb.com>
 Josh Duck <josh@fb.com> <github@joshduck.com>
 Jun Wu <quark@lihdd.net>
 Keito Uchiyama <projects@keito.me> <keito@fb.com>
+Kunal Mehta <k.mehta@berkeley.edu> <kunalm@fb.com>
 Laurence Rowe <l@lrowe.co.uk> <laurence@lrowe.co.uk>
 Martin Andert <mandert@gmail.com>
 Michal Srb <xixixao@seznam.cz> xixixao <xixixao@seznam.cz>
diff --git a/AUTHORS b/AUTHORS
index 5c833555bd1f0..c343248cc589d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,4 @@
+Adam Solove <asolove@gmail.com>
 Alan deLevie <adelevie@gmail.com>
 Alex Zelenskiy <azelenskiy@fb.com>
 Alexander Solovyov <alexander@solovyov.net>
@@ -25,15 +26,19 @@ Daniel Gasienica <dgasienica@zynga.com>
 Daniel Lo Nigro <danlo@fb.com>
 Daniel Miladinov <dmiladinov@wingspan.com>
 Danny Ben-David <dannybd@fb.com>
+Daryl Lau <daryl@weak.io>
 David Hellsing <david@aino.se>
 David Hu <davidhu91@gmail.com>
 Dustin Getz <dgetz@wingspan.com>
 Eric Clemmons <eric@smarterspam.com>
+Eric Florenzano <floguy@gmail.com>
 Eric Schoffstall <contra@wearefractal.com>
+Evan Coonrod <evan@paloalto.com>
 Fabio M. Costa <fabiomcosta@gmail.com>
 Felipe Oliveira Carvalho <felipekde@gmail.com>
 Felix Kling <fkling@fb.com>
 Fernando Correia <fernando@servicero.com>
+Greg Hurrell <glh@fb.com>
 Greg Roodt <groodt@gmail.com>
 Guido Bouman <m@guido.vc>
 Harry Hull <harry.hull1@gmail.com>
@@ -42,6 +47,7 @@ Ian Obermiller <iano@fb.com>
 Ingvar Stepanyan <me@rreverser.com>
 Isaac Salier-Hellendag <isaac@fb.com>
 Ivan Kozik <ivan@ludios.org>
+Jaime Mingo <j.mingov@3boll.com>
 Jakub Malinowski <jakubmal@gmail.com>
 James Ide <ide@fb.com>
 Jamie Wong <jamie.lf.wong@gmail.com>
@@ -51,9 +57,12 @@ Jared Forsyth <jared@jaredforsyth.com>
 Jason Bonta <jbonta@gmail.com>
 Jason Trill <jason@jasontrill.com>
 Jean Lauliac <lauliacj@gmail.com>
+Jeff Barczewski <jeff.barczewski@gmail.com>
+Jeff Carpenter <gcarpenterv@gmail.com>
 Jeff Morrison <jeff@anafx.com>
 Jeffrey Lin <lin.jeffrey@gmail.com>
 Jignesh Kakadiya <jigneshhk1992@gmail.com>
+Jing Chen <jingc@fb.com>
 Johannes Baiter <johannes.baiter@gmail.com>
 John Watson <jwatson@fb.com>
 Jonas Gebhardt <jonas@instagram.com>
@@ -66,6 +75,7 @@ Kit Randel <kit@nocturne.net.nz>
 Kunal Mehta <k.mehta@berkeley.edu>
 Laurence Rowe <l@lrowe.co.uk>
 Levi McCallum <levi@levimccallum.com>
+Lily <qvang.j@gmail.com>
 Logan Allen <loganfynne@gmail.com>
 Luigy Leon <luichi.19@gmail.com>
 Mark Richardson <echo@fb.com>
@@ -103,7 +113,9 @@ Sundeep Malladi <sundeep.malladi@gmail.com>
 Thomas Aylott <oblivious@subtlegradient.com>
 Timothy Yung <yungsters@gmail.com>
 Tom Occhino <tomocchino@gmail.com>
+Ville Immonen <ville.immonen@iki.fi>
 Vjeux <vjeuxx@gmail.com>
 Wincent Colaiuta <win@wincent.com>
 Zach Bruggeman <zbruggeman@me.com>
+fxbois <fxbois@gmail.com>
 imagentleman <imagentlemail@gmail.com>