diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..8701b1919
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,5 @@
+Shawn Pearce <spearce@spearce.org>	Shawn O. Pearce <sop@google.com>
+Shawn Pearce <spearce@spearce.org>	Shawn Pearce <sop@google.com>
+Shawn Pearce <spearce@spearce.org>	Shawn O. Pearce <spearce@spearce.org>
+Saša Živkov <sasa.zivkov@sap.com>	Sasa Zivkov <sasa.zivkov@sap.com>
+Saša Živkov <sasa.zivkov@sap.com>	Saša Živkov <zivkov@gmail.com>