diff --git a/.mailmap b/.mailmap
index 35af1dd90b..65feb31422 100644
--- a/.mailmap
+++ b/.mailmap
@@ -15,9 +15,11 @@ Jeffrey Lin <lin.jeffrey@gmail.com> <jeffreylin@fb.com>
 Jonathan Hsu <jhiswin@gmail.com>
 Jordan Walke <jordojw@gmail.com>
 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>
 Laurence Rowe <l@lrowe.co.uk> <laurence@lrowe.co.uk>
+Martin Andert <mandert@gmail.com>
 Michal Srb <xixixao@seznam.cz> xixixao <xixixao@seznam.cz>
 Nick Gavalas <njg57@cornell.edu>
 Nick Thompson <ncthom91@gmail.com> <nickt@instagram.com>
diff --git a/AUTHORS b/AUTHORS
index 8a8bf4c6d2..87c053e43d 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -27,6 +27,7 @@ Daniel Miladinov <dmiladinov@wingspan.com>
 Danny Ben-David <dannybd@fb.com>
 David Hellsing <david@aino.se>
 David Hu <davidhu91@gmail.com>
+Dustin Getz <dgetz@wingspan.com>
 Eric Clemmons <eric@smarterspam.com>
 Eric Schoffstall <contra@wearefractal.com>
 Fabio M. Costa <fabiomcosta@gmail.com>
@@ -69,6 +70,7 @@ Logan Allen <loganfynne@gmail.com>
 Luigy Leon <luichi.19@gmail.com>
 Mark Richardson <echo@fb.com>
 Marshall Roch <mroch@fb.com>
+Martin Andert <mandert@gmail.com>
 Martin Konicek <mkonicek@fb.com>
 Mathieu M-Gosselin <mathieumg@gmail.com>
 Matt Harrison <mt.harrison86@gmail.com>
@@ -103,3 +105,4 @@ Vjeux <vjeuxx@gmail.com>
 Wincent Colaiuta <win@wincent.com>
 Zach Bruggeman <zbruggeman@me.com>
 imagentleman <imagentlemail@gmail.com>
+plievone <plievone@cc.hut.fi>