diff --git a/.mailmap b/.mailmap
index cc5b443adac..db60d1e699b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -138,6 +138,7 @@ Jenkins <jenkins@ceph.com> Jenkins Build Slave User <jenkins-build@trusty-small-
 Jiang Heng <jiangheng0511@gmail.com>
 Jiantao He <hejiantao5@gmail.com>
 Jian Wen <wenjian@letv.com> <wenjianhn@gmail.com>
+Jianjian huo <jianjian.huo@ssi.samsung.com> <samuel.huo@gmail.com>
 Jingkai Yuan <jingkai.yuan@intel.com>
 Ji Chen <insomnia@139.com>
 João Eduardo Luís <joao.luis@inktank.com>
diff --git a/.organizationmap b/.organizationmap
index 3ade11a88f0..727198d5659 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -339,6 +339,7 @@ Roald van Loon Consultancy <roald@roaldvanloon.nl> Roald J. van Loon <roald@roal
 Ruijie Networks <contact@ruijie.com.cn> Ning Yao <yaoning@ruijie.com.cn>
 Sandia National Laboratories <contact@sandia.gov> Jim Schutt <jaschut@sandia.gov>
 Samsung <contact@samsung.com> James Liu <james.liu@ssi.samsung.com>
+Samsung <contact@samsung.com> Jianjian Huo <jianjian.huo@ssi.samsung.com>
 Samsung <contact@samsung.com> Subramanyam Varanasi <s.varanasi@ssi.samsung.com>
 SanDisk <contact@sandisk.com> Allen Samuels <allen.samuels@sandisk.com>
 SanDisk <contact@sandisk.com> Anand Bhat <anand.bhat@sandisk.com>
@@ -455,7 +456,6 @@ Unaffiliated <no@organization.net> Jiang Heng <jiangheng0511@gmail.com>
 Unaffiliated <no@organization.net> Jianhui Yuan <zuiwanyuan@gmail.com>
 Unaffiliated <no@organization.net> Jiantao He <hejiantao5@gmail.com>
 Unaffiliated <no@organization.net> Jian Wen <wenjian@letv.com>
-Unaffiliated <no@organization.net> Jianjian Huo <samuel.huo@gmail.com>
 Unaffiliated <no@organization.net> Jiaying Ren <mikulely@gmail.com>
 Unaffiliated <no@organization.net> John Coyle <dx9err@gmail.com>
 Unaffiliated <no@organization.net> Jon Bernard <jbernard@tuxion.com>