diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..ff92ecfb
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+David Woodhouse <dwmw2@infradead.org> <david.woodhouse@intel.com>
+Nikos Mavrogiannopoulos <nmav@gnutls.org> <nmav@redhat.com>
+Nikos Mavrogiannopoulos <nmav@gnutls.org> <n.mavrogiannopoulos@gmail.com>
+Nikos Mavrogiannopoulos <nmav@gnutls.org> <nikos@esat.kuleuven.be>
diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index 06899293..00000000
--- a/AUTHORS
+++ /dev/null
@@ -1,2 +0,0 @@
-Nikos Mavrogiannopoulos <nmav@gnutls.org>
-
diff --git a/Makefile.am b/Makefile.am
index b131d00e..b8f17c04 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
-EXTRA_DIST = LICENSE README.md CONTRIBUTING.md
+EXTRA_DIST = LICENSE README.md CONTRIBUTING.md AUTHORS
+
+DISTCLEANFILES = AUTHORS
 
 SUBDIRS = gl
 SUBDIRS += src doc tests
@@ -28,6 +30,10 @@ cscope:
 
 cref: ctags cscope
 
+AUTHORS:
+	@echo -e "The authors list is autogenerated from the git history; sorted by number of commits\n" >AUTHORS
+	@git shortlog -sen| cut -f 2 | sed 's/@/ at /g' >> AUTHORS
+
 ChangeLog:
 	git log --pretty > ChangeLog
 .PHONY: ChangeLog
@@ -43,4 +49,4 @@ dist-hook: files-compare ChangeLog
 	mv ChangeLog $(distdir)
 	test -f doc/ocserv.8 && test -f doc/ocpasswd.8 && test -f doc/occtl.8
 
-.PHONY: files-update files-compare
+.PHONY: files-update files-compare AUTHORS