diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000000000000000000000000000000000..bf0849747acfe4687d71d559c5a39af6380c690d
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Richard Hartmann <richih.mailinglist@gmail.com> <richih+github.com@richih.org>
diff --git a/tools/list_AUTHORS b/tools/list_AUTHORS
index 2b91ac97945b45ad539e2d00882c6b864009671e..351820564a77614b5b10f335d38cf5ba549d76fa 100755
--- a/tools/list_AUTHORS
+++ b/tools/list_AUTHORS
@@ -2,4 +2,4 @@
 
 echo 'Alphabetical list of everyone who ever committed to this repository
 '
-git log --all --format='%an <%ae>' | sort -u -k2
+git shortlog -se --all | cut -f1 --complement | sort -u -k2