diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..2f5a9c7da2
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Dimitri Papadopoulos Orfanos <3234522+DimitriPapadopoulos@users.noreply.github.com>
+luzpaz <luzpaz@@users.noreply.github.com> <luzpaz@users.noreply.github.com>