diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..9b63f589
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,20 @@
+Aleksa Sarai <cyphar@cyphar.com> <asarai@suse.de>
+Alexander Morozov <lk4d4math@gmail.com> <lk4d4@docker.com>
+Amit Saha <amitsaha.in@gmail.com> <amitsaha@users.noreply.github.com>
+Antonio Murdaca <runcom@linux.com> <runcom@redhat.com>
+Brandon Philips <brandon@ifup.org> <brandon.philips@coreos.com>
+Brandon Philips <brandon@ifup.org> <brandon@ifup.co>
+ChengTiesheng <chengtiesheng@huawei.com>
+Daniel, Dao Quang Minh <dqminh89@gmail.com>
+Doug Davis <dug@us.ibm.com> <duglin@users.noreply.github.com>
+John Howard <jhoward@microsoft.com> <John.Howard@microsoft.com>
+LinZhinan(Zen Lin) <linzhinan@huawei.com>
+Mrunal Patel <mrunalp@gmail.com> <mrunal@Mrunals-iMac.local>
+Mrunal Patel <mrunalp@gmail.com> <mrunal@dhcp-16-185.sjc.redhat.com>
+Mrunal Patel <mrunalp@gmail.com> <mrunal@me.com>
+Vincent Batts <vbatts@hashbangbash.com> <vbatts@hashbangbash.com>
+Vincent Batts <vbatts@hashbangbash.com> <vbatts@redhat.com>
+Vishnu Kannan <vishnuk@google.com>
+Vishnu Kannan <vishnuk@google.com> <vishh@users.noreply.github.com>
+Zefan Li <lizefan@huawei.com> <lizf1984@hotmail.com>
+梁辰晔 (Liang Chenye) <liangchenye@huawei.com>