diff --git a/.mailmap b/.mailmap
index 2b3e1662c..984a1d706 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,15 +5,14 @@ Bryan Havenstein <bryan.havenstein@ericsson.com>
 David Charles Kennedy <dkennedy@hp.com>
 Dmitri Zimine <dz@stackstorm.com>
 Lakshmi Kannan <lakshmi@stackstorm.com> <lakshmi+github@lakshmikannan.me>
-Lingxian Kong <konglingxian@huawei.com>
 Lingxian Kong <konglingxian@huawei.com> <anlin.kong@gmail.com>
 Liu Sheng <liusheng@huawei.com>
 Manas Kelshikar <manas@stackstorm.com>
 Noa Koffman <noa.koffman@alcatel-lucent.com>
-Renat Akhmerov <rakhmerov@mirantis.com>
+Renat Akhmerov <renat.akhmerov@gmail.com> <rakhmerov@mirantis.com>
 Rico Lin <rico.lin.guanyu@gmail.com>
 Timur Nurlygayanov <tnurlygayanov@mirantis.com>
 Venkata Mahesh Kotha <venkatamaheshkotha@gmail.com>
 Winson Chan <wcchan@stackstorm.com> <m4d.coder@gmail.com>
-Winson Chan <wcchan@stackstorm.com> <wcchan@stackstorm.com>
 Zhu Rong <zhu.rong@99cloud.net>
+ZhiQiang Fan <aji.zqfan@gmail.com> <zhiqiang.fan@huawei.com>