diff --git a/.mailmap b/.mailmap
index 172c761c..4a6368f2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -73,3 +73,8 @@ Eohyung Lee <liquidnuker@gmail.com> <liquid@kt.com>
 Harshit Chitalia <harshit@acelio.com> <harshit@acelio.com>
 Richard Hawkins <richard.hawkins@rackspace.com>
 Sarvesh Ranjan <saranjan@cisco.com>
+Minwoo Bae <minwoob@us.ibm.com> Minwoo B
+Jaivish Kothari <jaivish.kothari@nectechnologies.in> <janonymous.codevulture@gmail.com>
+Michael Matur <michael.matur@gmail.com>
+Kazuhiro Miyahara <miyahara.kazuhiro@lab.ntt.co.jp>
+Alexandra Settle <alexandra.settle@rackspace.com>
diff --git a/AUTHORS b/AUTHORS
index ce680dae..ebde31a3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -29,6 +29,7 @@ Mehdi Abaakouk (mehdi.abaakouk@enovance.com)
 Jesse Andrews (anotherjesse@gmail.com)
 Joe Arnold (joe@swiftstack.com)
 Ionuț Arțăriși (iartarisi@suse.cz)
+Minwoo Bae (minwoob@us.ibm.com)
 Bob Ball (bob.ball@citrix.com)
 Christian Berendt (berendt@b1-systems.de)
 Luis de Bethencourt (luis@debethencourt.com)
@@ -42,9 +43,11 @@ Pádraig Brady (pbrady@redhat.com)
 Lorcan Browne (lorcan.browne@hp.com)
 Russell Bryant (rbryant@redhat.com)
 Jay S. Bryant (jsbryant@us.ibm.com)
+Tim Burke (tim.burke@gmail.com)
 Brian D. Burns (iosctr@gmail.com)
 Devin Carlen (devin.carlen@gmail.com)
 Thierry Carrez (thierry@openstack.org)
+Emmanuel Cazenave (contact@emcaz.fr)
 Mahati Chamarthy (mahati.chamarthy@gmail.com)
 Zap Chang (zapchang@gmail.com)
 François Charlier (francois.charlier@enovance.com)
@@ -88,6 +91,7 @@ Dan Hersam (dan.hersam@hp.com)
 Derek Higgins (derekh@redhat.com)
 Alex Holden (alex@alexjonasholden.com)
 Edward Hope-Morley (opentastic@gmail.com)
+Joanna H. Huang (joanna.huitzu.huang@gmail.com)
 Kun Huang (gareth@unitedstack.com)
 Matthieu Huin (mhu@enovance.com)
 Hodong Hwang (hodong.hwang@kt.com)
@@ -111,6 +115,7 @@ Nathan Kinder (nkinder@redhat.com)
 Eugene Kirpichov (ekirpichov@gmail.com)
 Leah Klearman (lklrmn@gmail.com)
 Martin Kletzander (mkletzan@redhat.com)
+Jaivish Kothari (jaivish.kothari@nectechnologies.in)
 Steve Kowalik (steven@wedontsleep.org)
 Sergey Kraynev (skraynev@mirantis.com)
 Sushil Kumar (sushil.kumar2@globallogic.com)
@@ -135,6 +140,7 @@ Steve Martinelli (stevemar@ca.ibm.com)
 Juan J. Martinez (juan@memset.com)
 Marcelo Martins (btorch@gmail.com)
 Dolph Mathews (dolph.mathews@gmail.com)
+Michael Matur (michael.matur@gmail.com)
 Donagh McCabe (donagh.mccabe@hp.com)
 Andy McCrae (andy.mccrae@gmail.com)
 Paul McMillan (paul.mcmillan@nebula.com)
@@ -142,6 +148,7 @@ Ewan Mellor (ewan.mellor@citrix.com)
 Samuel Merritt (sam@swiftstack.com)
 Stephen Milton (milton@isomedia.com)
 Jola Mirecka (jola.mirecka@hp.com)
+Kazuhiro Miyahara (miyahara.kazuhiro@lab.ntt.co.jp)
 Daisuke Morita (morita.daisuke@lab.ntt.co.jp)
 Dirk Mueller (dirk@dmllr.de)
 Russ Nelson (russ@crynwr.com)
@@ -161,6 +168,7 @@ Sascha Peilicke (saschpe@gmx.de)
 Constantine Peresypkin (constantine.peresypk@rackspace.com)
 Dieter Plaetinck (dieter@vimeo.com)
 Dan Prince (dprince@redhat.com)
+Sarvesh Ranjan (saranjan@cisco.com)
 Felipe Reyes (freyes@tty.cl)
 Janie Richling (jrichli@us.ibm.com)
 Matt Riedemann (mriedem@us.ibm.com)
@@ -171,9 +179,9 @@ Aaron Rosen (arosen@nicira.com)
 Brent Roskos (broskos@internap.com)
 Shilla Saebi (shilla.saebi@gmail.com)
 Cristian A Sanchez (cristian.a.sanchez@intel.com)
-Sarvesh Ranjan (saranjan@cisco.com)
 Christian Schwede (cschwede@redhat.com)
 Mark Seger (Mark.Seger@hp.com)
+Alexandra Settle (alexandra.settle@rackspace.com)
 Andrew Clay Shafer (acs@parvuscaptus.com)
 Mitsuhiro SHIGEMATSU (shigematsu.mitsuhiro@lab.ntt.co.jp)
 Dhriti Shikhar (dhrish20@gmail.com)
@@ -181,6 +189,7 @@ Chuck Short (chuck.short@canonical.com)
 Michael Shuler (mshuler@gmail.com)
 David Moreau Simard (dmsimard@iweb.com)
 Scott Simpson (sasimpson@gmail.com)
+Pradeep Kumar Singh (pradeep.singh@nectechnologies.in)
 Liu Siqi (meizu647@gmail.com)
 Adrian Smith (adrian_f_smith@dell.com)
 Jon Snitow (otherjon@swiftstack.com)
@@ -188,6 +197,7 @@ TheSriram (sriram@klusterkloud.com)
 Jeremy Stanley (fungi@yuggoth.org)
 Mauro Stettler (mauro.stettler@gmail.com)
 Tobias Stevenson (tstevenson@vbridges.com)
+Victor Stinner (vstinner@redhat.com)
 Pearl Yajing Tan (pearl.y.tan@seagate.com)
 Yuriy Taraday (yorik.sar@gmail.com)
 Monty Taylor (mordred@inaugust.com)
@@ -223,4 +233,3 @@ Hua Zhang (zhuadl@cn.ibm.com)
 Jian Zhang (jian.zhang@intel.com)
 Ning Zhang (ning@zmanda.com)
 Yuan Zhou (yuan.zhou@intel.com)
-Kazuhiro Miyahara (miyahara.kazuhiro@lab.ntt.co.jp)