diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..3414637
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,8 @@
+Danny Moesch <danny.moesch@icloud.com> Danny Mösch <danny.moesch@icloud.com>
+
+Mingshen Sun <bob@mssun.me> Bob Sun <bob@mssun.me>
+
+Moritz Kuntze <mfk@zortac.net> Moritz F. Kuntze <martllcraft@gmail.com>
+
+Yishi Lin <yishilin14@gmail.com> yishilin14 <yishilin14@gmail.com>
+