diff --git a/.mailmap b/.mailmap
index ba6f655cd8c..7d8ac03f80a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -105,6 +105,7 @@ Christophe Courtaut <christophe.courtaut@gmail.com> Kri5 <christophe.courtaut@gm
 Loic Dachary <loic@dachary.org> <loic@dachary.com>
 Loic Dachary <loic@dachary.org> Loïc Dachary <loic@dachary.org>
 Yan, Zheng <zheng.z.yan@intel.com> Zheng, Yan <zheng.z.yan@intel.com>
+Yan, Zheng <zheng.z.yan@intel.com> <ukernel@gmail.com>
 David Moreau Simard <dmsimard@iweb.com> <moi@dmsimard.com>
 Andrew Leung <aleung@cs.ucsc.edu> anwleung <anwleung@29311d96-e01e-0410-9327-a35deaab8ce9>
 Carlos Maltzahn <carlosm@cs.ucsc.edu> carlosm <carlosm@29311d96-e01e-0410-9327-a35deaab8ce9>
@@ -115,3 +116,4 @@ Ron Allred <rallred@itrefined.com> rallred <ron-github@neversleep.net>
 Dan Chai <tengweicai@gmail.com> danchai <tengweicai@gmail.com>
 Christian Marie <pingu@anchor.net.au> <christian@ponies.io>
 Ma Jianpeng <majianpeng@gmail.com> majianpeng <majianpeng@gmail.com>
+Eric Mourgaya <eric.mourgaya@arkea.com> <eric.mourgaya@gmail.com>
diff --git a/.organizationmap b/.organizationmap
index 1bf4957566e..ba434567440 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -79,6 +79,10 @@ eNovance <contact@enovance.com> Babu Shanmugam <anbu@enovance.com>
 eNovance <contact@enovance.com> Sebastien Han <sebastien.han@enovance.com>
 Debian GNU/Linux <contact@debian.org> Laszlo Boszormenyi <gcs@debian.hu>
 Debian GNU/Linux <contact@debian.org> Bastian Blank <waldi@debian.org>
+Debian GNU/Linux <contact@debian.org> Dmitry Smirnov <onlyjob@member.fsf.org>
+SanDisk <contact@sandisk.com> Somnath Roy <somnath.roy@sandisk.com>
+Bigpoint.com <contact@bigpoint.net> Moritz Möller <mm@mxs.de>
+Credit Mutuel Arkea <contact@arkea.com> Eric Mourgaya <eric.mourgaya@arkea.com>
 GNU <contact@gnu.org> Alexandre Oliva <oliva@gnu.org>
 Hastexo <contact@hastexo.com> Florian Haas <florian@hastexo.com>
 Canonical <contact@canonical.com> James Page <james.page@ubuntu.com>
@@ -102,6 +106,7 @@ SWITCH <contact@switch.ch> Jens-Christian Fischer <jens-christian.fischer@switch
 SWITCH <contact@switch.ch> Simon Leinen <simon.leinen@switch.ch>
 Yahoo! <contact@yahoo-inc.com> Haifeng Liu <haifeng@yahoo-inc.com>
 Yahoo! <contact@yahoo-inc.com> Xihui He <xihuihe@gmail.com>
+Yahoo! <contact@yahoo-inc.com> Ray Lv <xiangyulv@gmail.com>
 UnitedStack <contact@unitedstack.com> Guangliang Zhao <guangliang@unitedstack.com>
 UnitedStack <contact@unitedstack.com> Haomai Wang <haomaiwang@gmail.com>
 UnitedStack <contact@unitedstack.com> Kun Huang <academicgareth@gmail.com>
@@ -117,6 +122,7 @@ University of Utah <contact@utah.edu> Xing Lin <xinglin@cs.utah.edu>
 Carnegie Mellon University <contact@cmu.edu> Jan Harkes <jaharkes@cs.cmu.edu>
 University of Mississippi <contact@umd.edu> Liam Monahan <liam@umiacs.umd.edu>
 University of Mississippi <contact@umd.edu> Padraig O'Sullivan <posulliv@umd.edu>
+University of Mississippi <contact@umd.edu> Derek Yarnell <derek@umiacs.umd.edu>
 Sandia National Laboratories <contact@sandia.gov> Jim Schutt <jaschut@sandia.gov>
 Pacific Northwest National Laboratory <contact@pnl.gov> Erwin, Brock A <Brock.Erwin@pnl.gov>
 Pacific Northwest National Laboratory <contact@pnl.gov> Brown, David M JR <david.brown@pnl.gov>