diff --git a/.gitignore b/.gitignore
index 8bc49004..f02eb631 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@
 # Exclude all hidden files
 .*
 
-# Except those related to git(lab)
+# Except those related to git(lab) and .mailmap
 !.git*
 !.gitlab-ci.yml
+!.mailmap
+
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..d41706ae
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Alexander A. Klimov <alexander.klimov@icinga.com> <alexander.klimov@icinga.com>
+Jean Flach <jean.flach@icinga.com> <jean-marcel.flach@icinga.com>
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 00000000..eb25d6e9
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,8 @@
+Alexander A. Klimov <alexander.klimov@icinga.com>
+Eric Lippmann <eric.lippmann@icinga.com>
+Jean Flach <jean.flach@icinga.com>
+Johannes Meyer <johannes.meyer@icinga.com>
+Justin Müller <justin.mueller@icinga.com>
+Markus Frosch <markus.frosch@icinga.com>
+Michael Friedrich <michael.friedrich@icinga.com>
+Noah Hilverling <noah.hilverling@icinga.com>