diff --git a/.mailmap b/.mailmap
index 5dbb4c6b8d..e4d3b698fa 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,5 +1,6 @@
 Ben Newman <bn@cs.stanford.edu> <benjamn@fb.com>
 Dan Schafer <dschafer@fb.com>
+Harry Hull <harry.hull1@gmail.com>
 Jeff Morrison <jeff@anafx.com> <Jeff@anafx.com>
 Jeff Morrison <jeff@anafx.com> JeffMo <jeffmo@fb.com>
 Jeffrey Lin <lin.jeffrey@gmail.com> <jeffreylin@fb.com>
@@ -12,7 +13,9 @@ Paul Shen <paul@mnml0.com> <paulshen@fb.com>
 Pete Hunt <floydophone@gmail.com>
 Pete Hunt <floydophone@gmail.com> <pete.hunt@fb.com>
 Pete Hunt <floydophone@gmail.com> <pete@instagram.com>
+Sander Spies <sandermail@gmail.com>
 Sebastian Markbåge <sebastian@calyptus.eu> <sema@fb.com>
 Stoyan Stefanov <ssttoo@ymail.com>
 Timothy Yung <yungsters@gmail.com> <yungsters@fb.com>
 Vjeux <vjeuxx@gmail.com>
+Vjeux <vjeuxx@gmail.com> <vjeux@fb.com>
diff --git a/AUTHORS b/AUTHORS
index 3b8082a3ce..55225b1f6d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,4 @@
+Alexander Solovyov <alexander@solovyov.net>
 Andrew Zich <azich@fb.com>
 Andrey Popp <8mayday@gmail.com>
 Ben Alpert <spicyjalapeno@gmail.com>
@@ -7,12 +8,15 @@ Cam Spiers <camspiers@gmail.com>
 Cheng Lou <chenglou92@gmail.com>
 Christian Roman <chroman16@gmail.com>
 Clay Allsopp <clay.allsopp@gmail.com>
+Connor McSheffrey <connor.mcsheffrey@gmail.com>
 Dan Schafer <dschafer@fb.com>
 Daniel Gasienica <dgasienica@zynga.com>
+Daniel Miladinov <dmiladinov@wingspan.com>
 Danny Ben-David <dannybd@fb.com>
 David Hu <davidhu91@gmail.com>
 Eric Clemmons <eric@smarterspam.com>
 Greg Roodt <groodt@gmail.com>
+Harry Hull <harry.hull1@gmail.com>
 Hugo Jobling <me@thisishugo.com>
 Isaac Salier-Hellendag <isaac@fb.com>
 Jakub Malinowski <jakubmal@gmail.com>
@@ -22,15 +26,21 @@ Jan Kassens <jkassens@fb.com>
 Jeff Morrison <jeff@anafx.com>
 Jeffrey Lin <lin.jeffrey@gmail.com>
 Jordan Walke <jordojw@gmail.com>
+Josh Duck <josh@fb.com>
+Keito Uchiyama <keito@fb.com>
 Kunal Mehta <k.mehta@berkeley.edu>
 Laurence Rowe <l@lrowe.co.uk>
+Marshall Roch <mroch@fb.com>
+Martin Konicek <mkonicek@fb.com>
 Mathieu M-Gosselin <mathieumg@gmail.com>
 Nick Gavalas <njg57@cornell.edu>
+Owen Coutts <owenc@fb.com>
 Paul O’Shannessy <paul@oshannessy.com>
 Paul Seiffert <paul.seiffert@gmail.com>
 Paul Shen <paul@mnml0.com>
 Pete Hunt <floydophone@gmail.com>
 Peter Cottle <pcottle@fb.com>
+Sander Spies <sandermail@gmail.com>
 Sebastian Markbåge <sebastian@calyptus.eu>
 Stoyan Stefanov <ssttoo@ymail.com>
 Timothy Yung <yungsters@gmail.com>