diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..7a9ca51
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Emil Velikov <emil.l.velikov@gmail.com> <emil.velikov@collabora.com>