diff --git a/.mailmap b/.mailmap
index 7de8daa89d..f2aa13e934 100644
--- a/.mailmap
+++ b/.mailmap
@@ -25,3 +25,4 @@ Russ Nelson <russ@crynwr.com> <nelson@nelson-laptop>
 Marcelo Martins <btorch@gmail.com> <marcelo.martins@rackspace.com>
 Andrew Clay Shafer <acs@parvuscaptus.com> <andrew@cloudscaling.com>
 Soren Hansen <soren@linux2go.dk> <soren.hansen@rackspace.com>
+Ye Jia Xu <xyj.asmy@gmail.com> monsterxx03 <xyj.asmy@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index be0783a2cc..ea34009cb1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -65,4 +65,5 @@ Chris Wedgwood (cw@f00f.org)
 Conrad Weidenkeller (conrad.weidenkeller@rackspace.com)
 Doug Weimer (dweimer@gmail.com)
 Cory Wright (cory.wright@rackspace.com)
+Ye Jia Xu (xyj.asmy@gmail.com)
 Pete Zaitcev (zaitcev@kotori.zaitcev.us)