diff --git a/.mailmap b/.mailmap
index 15d8f359..93a4aed1 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,3 +1,5 @@
+Thomas Adamcik <thomas@adamcik.no> <adamcik@samfundet.no>
+Thomas Adamcik <thomas@adamcik.no> <thomas+github@adamcik.no>
 Kristian Klette <klette@samfundet.no>
 Johannes Knutsen <johannes@knutseninfo.no> <johannes@iterate.no>
 Johannes Knutsen <johannes@knutseninfo.no> <johannes@barbarmaclin.(none)>
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 00000000..9c9951f8
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,13 @@
+- Stein Magnus Jodal <stein.magnus@jodal.no>
+- Johannes Knutsen <johannes@knutseninfo.no>
+- Thomas Adamcik <thomas@adamcik.no>
+- Kristian Klette <klette@samfundet.no>
+- Martins Grunskis <martins@grunskis.com>
+- Henrik Olsson <henrik@fixme.se>
+- Antoine Pierlot-Garcin <antoine@bokbox.com>
+- John Bäckstrand <sopues@gmail.com>
+- Fred Hatfull <fred.hatfull@gmail.com>
+- Erling Børresen <erling@fenicore.net>
+- David C <dav@dav.com>
+- Christian Johansen <christian@cjohansen.no>
+- Matt Bray <mattjbray@gmail.com>
diff --git a/docs/authors.rst b/docs/authors.rst
index 822abc15..97a2dd2b 100644
--- a/docs/authors.rst
+++ b/docs/authors.rst
@@ -4,13 +4,7 @@ Authors
 
 Contributors to Mopidy in the order of appearance:
 
-- Stein Magnus Jodal <stein.magnus@jodal.no>
-- Johannes Knutsen <johannes@knutsen.me>
-- Thomas Adamcik <adamcik@samfundet.no>
-- Kristian Klette <klette@klette.us>
-
-A complete list of persons with commits accepted into the Mopidy repo can be
-found at `GitHub <https://github.com/mopidy/mopidy/graphs/contributors>`_.
+.. include:: ../AUTHORS
 
 
 Showing your appreciation
diff --git a/fabfile.py b/fabfile.py
index e2d77a06..267bdc23 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -12,3 +12,9 @@ def autotest():
         local(
             'inotifywait -q -e create -e modify -e delete '
             '--exclude ".*\.(pyc|sw.)" -r mopidy/ tests/')
+
+
+def update_authors():
+    # Keep authors in the order of appearance and use awk to filter out dupes
+    local(
+        "git log --format='- %aN <%aE>' --reverse | awk '!x[$0]++' > AUTHORS")