diff --git a/.mailmap b/.mailmap
index 758f36bcf8f..8cda958b42e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -119,3 +119,4 @@ 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>
 Danny Al-Gaaf <danny.al-gaaf@bisect.de> <danny.kukawka@bisect.de>
+Guang Yang <yguang@yahoo-inc.com> <guangyy@gmail.com>
diff --git a/.organizationmap b/.organizationmap
index a4979829af2..ba464499ae8 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -110,6 +110,7 @@ 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>
+Yahoo! <contact@yahoo-inc.com> Guang Yang <yguang@yahoo-inc.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>