diff --git a/.mailmap b/.mailmap
index 69ed487297324..e2796556b99c7 100644
--- a/.mailmap
+++ b/.mailmap
@@ -96,6 +96,7 @@ Eric Lee <eric.lee@hgst.com>
 Eric Mourgaya <eric.mourgaya@arkea.com> <eric.mourgaya@gmail.com>
 Erwin, Brock A <Brock.Erwin@pnl.gov> <Brock.Erwin@pnl.govgit>
 Esteban Molina-Estolano <eestolan@lanl.gov> <eestolan@29311d96-e01e-0410-9327-a35deaab8ce9>
+Fan Yang <yangf@neunn.com> <yfceph@gmail.com>
 Fangchen Sun <sunspot0105@gmail.com>
 Fang Yuxiang <fang.yuxiang@eisoo.com>
 Fang Yuxiang <fang.yuxiang@eisoo.com> <hrchu@users.noreply.github.com>
diff --git a/.organizationmap b/.organizationmap
index 1112be5d4ebf9..64220334b0011 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -331,6 +331,7 @@ MSys Technologies <contact@msystechnologies.com> Rajesh Nambiar <rajesh.n@msyste
 Nebula <info@nebula.com> Anton Aksola <anton.aksola@nebula.fi>
 Nebula <info@nebula.com> Chris Holcombe <chris.holcombe@nebula.com>
 Netease <contact@netease.com> Dong Wu <archer.wudong@gmail.com>
+Neunn <service@neunn.com> Fan Yang <yangf@neunn.com>
 Ocado <contact@ocado.com> Luis Periquito <luis.periquito@ocado.com>
 Odiso <contact@odiso.com> Alexandre Derumier <aderumier@odiso.com>
 Opower <contact@opower.com> Derrick Schneider <derrick.schneider@opower.com>