diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..5b1c71d
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,4 @@
+# Format is:
+# <preferred e-mail> <other e-mail 1>
+# <preferred e-mail> <other e-mail 2>
+Xingchao Yu <xingchao@unitedstack.com> <yuxcer@gmail.com>