diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..0145be4
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Mike Gerwitz <mikegerwitz@gnu.org> <mike@mikegerwitz.com>
diff --git a/tools/gitlog-to-authors b/tools/gitlog-to-authors
index 6702e69..0543c97 100755
--- a/tools/gitlog-to-authors
+++ b/tools/gitlog-to-authors
@@ -1,7 +1,7 @@
 #!/bin/sh
-# Outputs all contributor names and e-mail addresses.
+# Outputs all contributor names and e-mail addresses, sorted by commit count
 #
-#  Copyright (C) 2012, 2013 Mike Gerwitz
+#  Copyright (C) 2012, 2013, 2014 Mike Gerwitz
 #
 #  This file is part of GNU ease.js.
 #
@@ -19,5 +19,4 @@
 #  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-git shortlog --summary --email \
-  | cut -f2-
+git shortlog -ns --email