diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..1f2f86feb
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Michał Gołębiowski-Owczarek <m.goleb@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 4fe665e9e..52f2cf759 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,6 +16,7 @@ Jonas Jenwald <jonas.jenwald@gmail.com>
 Julian Viereck
 Justin D'Arcangelo <justindarc@gmail.com>
 Kalervo Kujala
+Michał Gołębiowski-Owczarek <m.goleb@gmail.com>
 Ophir Lojkine <@lovasoa>
 Rob Wu <rob@robwu.nl>
 Shaon Barman <shaon.barman@gmail.com>