diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000000000000000000000000000000000..9e5fb9468dbc65cd2bacb51b78a055998fad5bf6
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,16 @@
+#
+# This list is used by git-shortlog to fix a few botched name translations
+# in the git archive, either because the author's full name was messed up
+# and/or not always written the same way, making contributions from the
+# same person appearing not to be so or badly displayed. Also allows for
+# old email addresses to map to new email addresses.
+#
+# For format details, see "MAPPING AUTHORS" in "man git-shortlog".
+#
+# Please keep this list dictionary sorted.
+#
+
+Jeff Tao <jhtao@taosdata.com>
+Wade Zhang <wxzhang@taosdata.com>
+Shuduo Sang <sdsang@taosdata.com> <sangshuduo@gmail.com>
+Pan Yang <pyang@taosdata.com> <arielyang@gmail.com>
\ No newline at end of file