diff --git a/.mailmap b/.mailmap
index bdcbdd2cf..f566e646f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1 +1,2 @@
 J. David Ibáñez <jdavid.ibp@gmail.com> <jdavid@itaapy.com>
+Martin Lenders <authmill@datalove.me>
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 000000000..64fa00dba
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,30 @@
+The following people have contributed at least one patch to the
+pygit2 project (sorted alphabetically):
+
+Amit Bakshi
+András Veres-Szentkirályi
+Benjamin Kircher
+Bryan O'Sullivan
+Carlos Martín Nieto
+Christian Boos
+Dave Borowitz
+David Versmisse
+Erik van Zijst
+Han-Wen Nienhuys
+Hugh Cole-Baker
+J. David Ibáñez
+Jared Flatow
+John Szakmeister
+Josh Bleecher Snyder
+Julien Miotte
+Martin Lenders
+Nico von Geyso
+Petr Hosek
+Petr Viktorin
+Rui Abreu Ferreira
+Sarath Lakshman
+Sebastian Thiel
+Vicent Marti
+Yonggang Luo
+Zoran Zaric
+pistacchio