diff --git a/.mailmap b/.mailmap
index 7592d337..415e8a17 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,5 +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
+<rm@joyent.com> <rm@fingolfin.org>
 <ryan@joyent.com> <ry@tinyclouds.org>
 <bertbelder@gmail.com> <info@2bs.nl>
 <alan@prettyrobots.com> <alan@blogometer.com>
diff --git a/AUTHORS b/AUTHORS
index c5025490..84bd0fc1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,7 +11,6 @@ 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>