diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..efee3a86
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+<blerim.sheqa@icinga.com> <blerim.sheqa@netways.de>
diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 00000000..4dc22be9
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1 @@
+Blerim Sheqa <blerim.sheqa@icinga.com>