diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..c3319aa46
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+Adrian Heine <mail@adrianheine.de>
+Alistair Braidwood <alistair_braidwood@yahoo.co.uk>
+Forbes Lindesay <forbes@lindesay.co.uk>
+Rich Harris <richard.a.harris@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 5743ada49..4cd58982f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -41,7 +41,9 @@ Joel Kemp
 Johannes Herr
 John-David Dalton
 Jordan Gensler
+Jordan Harband
 Jordan Klassen
+Julian Wyzykowski
 Jürg Lehni
 Kai Cataldo
 keeyipchan
@@ -75,11 +77,11 @@ piotr
 PlNG
 Praveen N
 Prayag Verma
-ReadmeCritic
 r-e-d
+ReadmeCritic
 Renée Kooi
-Richard Gibson
 Rich Harris
+Richard Gibson
 Sebastian McKenzie
 Shahar Soel
 Sheel Bedi
@@ -87,8 +89,8 @@ Simen Bekkhus
 susiwen
 susiwen8
 Teddy Katz
-Timothy Gu
 Tim van der Lippe
+Timothy Gu
 Tony Ross
 Toru Nagashima
 tuesmiddt
@@ -96,4 +98,5 @@ Victor Homyakov
 Vladislav Tupikin
 Wexpo Lyu
 zsjforcn
+星灵
 龙腾道
diff --git a/bin/update_authors.sh b/bin/update_authors.sh
index 7533226d7..92fa1461b 100755
--- a/bin/update_authors.sh
+++ b/bin/update_authors.sh
@@ -1,3 +1,3 @@
 echo "List of Acorn contributors. Updated before every release." > AUTHORS
 echo >> AUTHORS
-git log --format='%aN' | grep -v 'Adrian Heine né Lang' | grep -v abraidwood | grep -v Rich-Harris | grep -v ForbesLindesay | sort -u >> AUTHORS
+git log --format='%aN' | sort -uf >> AUTHORS