diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000000..5dbb4c6b8d295
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,18 @@
+Ben Newman <bn@cs.stanford.edu> <benjamn@fb.com>
+Dan Schafer <dschafer@fb.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>
+Jordan Walke <jordojw@gmail.com>
+Jordan Walke <jordojw@gmail.com> <jordanjcw@fb.com>
+Laurence Rowe <l@lrowe.co.uk> <laurence@lrowe.co.uk>
+Nick Gavalas <njg57@cornell.edu>
+Paul O’Shannessy <paul@oshannessy.com> <poshannessy@fb.com>
+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>
+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>
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000000000..3b8082a3ceb2f
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,38 @@
+Andrew Zich <azich@fb.com>
+Andrey Popp <8mayday@gmail.com>
+Ben Alpert <spicyjalapeno@gmail.com>
+Ben Newman <bn@cs.stanford.edu>
+Brian Rue <brian@rollbar.com>
+Cam Spiers <camspiers@gmail.com>
+Cheng Lou <chenglou92@gmail.com>
+Christian Roman <chroman16@gmail.com>
+Clay Allsopp <clay.allsopp@gmail.com>
+Dan Schafer <dschafer@fb.com>
+Daniel Gasienica <dgasienica@zynga.com>
+Danny Ben-David <dannybd@fb.com>
+David Hu <davidhu91@gmail.com>
+Eric Clemmons <eric@smarterspam.com>
+Greg Roodt <groodt@gmail.com>
+Hugo Jobling <me@thisishugo.com>
+Isaac Salier-Hellendag <isaac@fb.com>
+Jakub Malinowski <jakubmal@gmail.com>
+James Ide <ide@fb.com>
+Jamie Wong <jamie.lf.wong@gmail.com>
+Jan Kassens <jkassens@fb.com>
+Jeff Morrison <jeff@anafx.com>
+Jeffrey Lin <lin.jeffrey@gmail.com>
+Jordan Walke <jordojw@gmail.com>
+Kunal Mehta <k.mehta@berkeley.edu>
+Laurence Rowe <l@lrowe.co.uk>
+Mathieu M-Gosselin <mathieumg@gmail.com>
+Nick Gavalas <njg57@cornell.edu>
+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>
+Sebastian Markbåge <sebastian@calyptus.eu>
+Stoyan Stefanov <ssttoo@ymail.com>
+Timothy Yung <yungsters@gmail.com>
+Vjeux <vjeuxx@gmail.com>
+Zach Bruggeman <zbruggeman@me.com>
diff --git a/scripts/authors b/scripts/authors
new file mode 100755
index 0000000000000..bbf52740a8170
--- /dev/null
+++ b/scripts/authors
@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+
+# Generate an AUTHORS file based on the output of git shortlog. It uses ABC
+# order, strips out leading spaces and numbers, then filters out specific
+# authors.
+
+git shortlog -se \
+  | perl -spe 's/^\s+\d+\s+//' \
+  | sed -e '/^CommitSyncScript.*$/d' \
+  > AUTHORS