diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..9c4f9bdd
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+<sukhwinder.dhillon@icinga.com> <sukhwinder33445@gmail.com>
+Alexander A. Klimov <alexander.klimov@icinga.com> <alexander.klimov@icinga.com>
+Ravi Kumar Kempapura Srinivasa <ravi.srinivasa@icinga.com> <33730024+raviks789@users.noreply.github.com>
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 00000000..827978b3
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,8 @@
+Alexander A. Klimov <alexander.klimov@icinga.com>
+Alvar Penning <alvar.penning@icinga.com>
+Johannes Meyer <johannes.meyer@icinga.com>
+Julian Brost <julian.brost@icinga.com>
+Noé Costa <noe.costa@icinga.com>
+Ravi Kumar Kempapura Srinivasa <ravi.srinivasa@icinga.com>
+Sukhwinder Dhillon <sukhwinder.dhillon@icinga.com>
+Yonas Habteab <yonas.habteab@icinga.com>