diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..d5718a2
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,3 @@
+Hugo Arès <hugo.ares@ericsson.com> Hugo Ares <hugo.ares@ericsson.com>
+Saša Živkov <sasa.zivkov@sap.com>  Sasa Zivkov <sasa.zivkov@sap.com>
+Shawn Pearce <sop@google.com>      Shawn O. Pearce <sop@google.com>