diff --git a/.mailmap b/.mailmap
index d380162e..45935be6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -16,3 +16,4 @@ Janez Troha <janez.troha@gmail.com> <dz0ny@ubuntu.si>
 Luke Giuliani <luke@giuliani.com.au>
 Colin Montgomerie <kiteflyingmonkey@gmail.com>
 Ignasi Fosch <natx@y10k.ws> <ifosch@serenity-2.local>
+Christopher Schirner <christopher@hackerspace-bamberg.de> <schinken@hackerspace-bamberg.de>
diff --git a/AUTHORS b/AUTHORS
index e36d953d..b7bad761 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -42,3 +42,7 @@
 - Sam Willcocks <sam@wlcx.cc>
 - Ignasi Fosch <natx@y10k.ws>
 - Arjun Naik <arjun@arjunnaik.in>
+- Christopher Schirner <christopher@hackerspace-bamberg.de>
+- Dmitry Sandalov <dmitry@sandalov.org>
+- Deni Bertovic <deni@kset.org>
+- Thomas Amland <thomas.amland@gmail.com>