diff --git a/.mailmap b/.mailmap
index cb89ba61..8cbe1a3e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -41,3 +41,4 @@ Caysho <caysho@internode.on.net> <mopidy-dev@mopidy-dev.mopidy-dev>
 Nick Aquina <nickaquina@gmail.com> <fantostisch@users.noreply.github.com>
 Jarryd Tilbrook <jrad.tilbrook@gmail.com>
 Matthieu Melquiond <matt.llvw@gmail.com>
+Geoffroy Youri Berret <kaliko@azylum.org>
diff --git a/AUTHORS b/AUTHORS
index 2b9839db..d6842980 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -111,3 +111,7 @@
 - Matthieu Melquiond <matt.llvw@gmail.com>
 - Damien Cassou <damien@cassou.me>
 - Leonid Bogdanov <leonid_bogdanov@mail.ru>
+- Geoffroy Youri Berret <kaliko@azylum.org>
+- Dan Stowell <danstowell@users.sourceforge.net>
+- Gildas Le Nadan <gildas@endemic-systems.com>
+- Zvonimir Fras <zvonimir@zvonimirfras.com>