diff --git a/.mailmap b/.mailmap
index 8d7ae40fe10..d0ada4c752c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -224,6 +224,7 @@ Thomas Bechtold <t.bechtold@telekom.de> <thomasbechtold@jpberlin.de>
 Thomas Cantin <thomas.cantin@telecom-bretagne.eu> ThomasCantin
 Thomas Laumondais <thomas.laumondais@gmail.com> <LSWS0275@EB-OR6251090.toulouse.francetelecom.fr>
 Thomas Johnson <NTmatter@gmail.com> <thomas.johnson@180amsterdam.com>
+Tianshan Qu <tianshan@xsky.com> <qutianshan@gmail.com>
 Tommi Virtanen <tv@inktank.com> <tommi.virtanen@dreamhost.com>
 Tommi Virtanen <tv@inktank.com> <tv@eagain.net>
 Tommi Virtanen <tv@inktank.com> <tv@hq.newdream.net>
diff --git a/.organizationmap b/.organizationmap
index 443ae679710..fff39b580f9 100644
--- a/.organizationmap
+++ b/.organizationmap
@@ -440,6 +440,7 @@ Wido 42on <contact@42on.com> Wido den Hollander <wido@42on.com>
 X-ION <contact@x-ion.de> Mouad Benchchaoui <m.benchchaoui@x-ion.de>
 X-ION <contact@x-ion.de> Stephan Renatus <s.renatus@x-ion.de>
 XSky <contact@xsky.com> Haomai Wang <haomai@xsky.com>
+XSky <contact@xsky.com> Tianshan Qu <tianshan@xsky.com>
 Yahoo! <contact@yahoo-inc.com> Guang Yang <yguang@yahoo-inc.com>
 Yahoo! <contact@yahoo-inc.com> Haifeng Liu <haifeng@yahoo-inc.com>
 Yahoo! <contact@yahoo-inc.com> Lei Dong <leidong@yahoo-inc.com>