diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..2b3e1662
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,19 @@
+# Format is:
+# <preferred e-mail> <other e-mail 1>
+# <preferred e-mail> <other e-mail 2>
+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>
+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>
diff --git a/AUTHORS b/AUTHORS
index 3f0e958a..3f279da5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3,9 +3,13 @@ Alexander Kuznetsov <akuznetsov@mirantis.com>
 Anastasia Kuznetsova <akuznetsova@mirantis.com>
 Angus Salkeld <angus.salkeld@rackspace.com>
 Ankita Wagh <ankita_wagh@symmactoolkit-c02lr80ufd57.symc.symantec.com>
+Antoine Musso <hashar@free.fr>
 Boris Pavlovic <boris@pavlovic.me>
+Bryan Havenstein <bryan.havenstein@ericsson.com>
 Christian Berendt <berendt@b1-systems.de>
+Claudiu Belu <cbelu@cloudbasesolutions.com>
 David C Kennedy <david.c.kennedy@hp.com>
+David Charles Kennedy <dkennedy@hp.com>
 Dmitri Zimine <dz@stackstorm.com>
 Doug Hellmann <doug@doughellmann.com>
 Ed Cranford <ed.cranford@rackspace.com>
@@ -15,19 +19,21 @@ Kirill Izotov <enykeev@stackstorm.com>
 Lakshmi Kannan <lakshmi@stackstorm.com>
 Limor Stotland <limor.bortman@alcatel-lucent.com>
 Lingxian Kong <konglingxian@huawei.com>
+Liu Sheng <liusheng@huawei.com>
 Manas Kelshikar <manas@stackstorm.com>
 Moshe Elisha <moshe.elisha@alcatel-lucent.com>
 Nikolay Mahotkin <nmakhotkin@mirantis.com>
+Noa Koffman <noa.koffman@alcatel-lucent.com>
 Pierre-Arthur MATHIEU <pierre-arthur.mathieu@hp.com>
 Ray Chen <chenrano2002@gmail.com>
 Renat Akhmerov <rakhmerov@mirantis.com>
+Rico Lin <rico.lin.guanyu@gmail.com>
+Rinat Sabitov <rinat.sabitov@gmail.com>
 Sergey Kolekonov <skolekonov@mirantis.com>
 Sergey Murashov <smurashov@mirantis.com>
 Timur Nurlygayanov <tnurlygayanov@mirantis.com>
+Venkata Mahesh Kotha <venkatamaheshkotha@gmail.com>
 Winson Chan <wcchan@stackstorm.com>
 Zhenguo Niu <niuzhenguo@huawei.com>
 ZhiQiang Fan <zhiqiang.fan@huawei.com>
-Bryan Havenstein <bryan.havenstein@ericsson.com>
-Liu Sheng <liusheng@huawei.com>
-Noa Koffman <noa.koffman@alcatel-lucent.com>
-Rico Lin <rico.lin.guanyu@gmail.com>
+Zhu Rong <zhu.rong@99cloud.net>