diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..d9aee6a
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,8 @@
+Aleksa Sarai <asarai@suse.de> <cyphar@cyphar.com>
+Brandon Philips <brandon.philips@coreos.com> <brandon@ifup.org>
+Doug Davis <dug@us.ibm.com> <duglin@users.noreply.github.com>
+Sergiusz Urbaniak <sur@coreos.com> <sergiusz.urbaniak@gmail.com>
+Stephen J Day <stephen.day@docker.com> <stevvooe@users.noreply.github.com>
+xiekeyang <xiekeyang@huawei.com> <keyang.xie@gmail.com>
+xiekeyang <xiekeyang@huawei.com> <xiekeyang@users.noreply.github.com>
+Zhou Hao <zhouhao@cn.fujitsu.com>