diff --git a/.mailmap b/.mailmap
index 2b533aa89..959e033d6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -17,3 +17,4 @@ Nikolay Sokolov <nsokolov@griddynamics.com> Nokolay Sokolov <nsokolov@griddynami
 Nikolay Sokolov <nsokolov@griddynamics.com> Nokolay Sokolov <chemikadze@gmail.com>
 <jake@ansolabs.com> <admin@jakedahn.com>
 <jeblair@hp.com> <james.blair@rackspace.com>
+zhangguoqing <zhangguoqingas@gmail.com> <zhangguoqing@windawn.com>