diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..7592d337c
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,6 @@
+# update AUTHORS with:
+#   git log --all --reverse --format='%aN <%aE>' | perl -ne 'BEGIN{print "# Authors ordered by first contribution.\n"} print unless $h{$_}; $h{$_} = 1' > AUTHORS
+<ryan@joyent.com> <ry@tinyclouds.org>
+<bertbelder@gmail.com> <info@2bs.nl>
+<alan@prettyrobots.com> <alan@blogometer.com>
+San-Tai Hsu <vanilla@fatpipi.com>
diff --git a/AUTHORS b/AUTHORS
index f3898b25b..c50254904 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,9 +11,12 @@ Henry Rawas <henryr@schakra.com>
 Robert Mustacchi <rm@joyent.com>
 Matt Stevens <matt@alloysoft.com>
 Paul Querna <pquerna@apache.org>
+Robert Mustacchi <rm@fingolfin.org>
 Shigeki Ohtsu <ohtsu@iij.ad.jp>
 Tom Hughes <tom.hughes@palm.com>
 Peter Bright <drpizza@quiscalusmexicanus.org>
 Jeroen Janssen <jeroen.janssen@gmail.com>
 Andrea Lattuada <ndr.lattuada@gmail.com>
 Augusto Henrique Hentz <ahhentz@gmail.com>
+Clifford Heath <clifford.heath@gmail.com>
+Jorge Chamorro Bieling <jorge@jorgechamorro.com>