diff --git a/.mailmap b/.mailmap
index 5c76ed76..0f1d843c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -5,6 +5,7 @@ Bert Belder <bertbelder@gmail.com> <user@ChrUbuntu.(none)>
 Brandon Philips <brandon.philips@rackspace.com> <brandon@ifup.org>
 Brian White <mscdex@mscdex.net>
 Brian White <mscdex@mscdex.net> <mscdex@gmail.com>
+Christoph Iserlohn <christoph.iserlohn@innoq.com>
 Frank Denis <github@pureftpd.org>
 Isaac Z. Schlueter <i@izs.me>
 Keno Fischer <kenof@stanford.edu> <kfischer+github@college.harvard.edu>
@@ -19,4 +20,5 @@ Saúl Ibarra Corretgé <saghul@gmail.com>
 Shigeki Ohtsu <ohtsu@iij.ad.jp> <ohtsu@ohtsu.org>
 Timothy J. Fontaine <tjfontaine@gmail.com>
 Yasuhiro Matsumoto <mattn.jp@gmail.com>
+Yazhong Liu <yorkiefixer@gmail.com>
 Yuki Okumura <mjt@cltn.org>
diff --git a/AUTHORS b/AUTHORS
index 9cb892c2..822f4fed 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -99,14 +99,14 @@ Maks Naumov <maksqwe1@ukr.net>
 Sean Farrell <sean.farrell@rioki.org>
 Chris Bank <cbank@adobe.com>
 Geert Jansen <geertj@gmail.com>
+Christoph Iserlohn <christoph.iserlohn@innoq.com>
+Steven Kabbes <stevenkabbes@gmail.com>
 Alex Gaynor <alex.gaynor@gmail.com>
 huxingyi <huxingyi@msn.com>
-ci-innoq <christoph.iserlohn@innoq.com>
-Steven Kabbes <stevenkabbes@gmail.com>
 Tenor Biel <tenorbiel@gmail.com>
 Andrej Manduch <AManduch@gmail.com>
 Joshua Neuheisel <joshua@neuheisel.us>
 Alexis Campailla <alexis@janeasystems.com>
-Yorkie <yorkiefixer@gmail.com>
+Yazhong Liu <yorkiefixer@gmail.com>
 Sam Roberts <vieuxtech@gmail.com>
 River Tarnell <river@loreley.flyingparchment.org.uk>