diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..904d8f26
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Luiz Augusto von Dentz <luiz.dentz-von@nokia.com>	Luiz Augusto Von Dentz <luiz.dentz-von@nokia.com>