diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..1f2f86f
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Michał Gołębiowski-Owczarek <m.goleb@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 8ead6c1..027d3ff 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -66,7 +66,7 @@ Matthew Chase Whittemore <matthew@socialtables.com>
 Matthew King <mking@users.noreply.github.com>
 Matthew Mueller <mattmuelle@gmail.com>
 Michaël Zasso <mic.besace@gmail.com>
-Michał Gołębiowski <m.goleb@gmail.com>
+Michał Gołębiowski-Owczarek <m.goleb@gmail.com>
 Nathan Rajlich <nathan@tootallnate.net>
 New Now Nohow <empty@cqdr.es>
 Nicolae Vartolomei <nvartolomei@gmail.com>