diff --git a/.mailmap b/.mailmap
index 6211922135257..851394b3e9dca 100644
--- a/.mailmap
+++ b/.mailmap
@@ -30,7 +30,7 @@
 <i@maskray.me> <maskray@google.com>
 <JCTremoulet@gmail.com> <jotrem@microsoft.com>
 <min@myhsu.dev> <minyihh@uci.edu>
-<qiucofan@cn.ibm.com> <qiucf@cn.ibm.com>
+<qcf@ecnelises.com> <qiucofan@cn.ibm.com> <qiucf@cn.ibm.com>
 <rnk@google.com> <reid@kleckner.net>
 <thakis@chromium.org> <nicolasweber@gmx.de>
 Jianjian GUAN <jacquesguan@me.com>
diff --git a/llvm/CREDITS.TXT b/llvm/CREDITS.TXT
index a6f042779da2e..fc02828e601c2 100644
--- a/llvm/CREDITS.TXT
+++ b/llvm/CREDITS.TXT
@@ -432,10 +432,6 @@ W: http://vladimir_prus.blogspot.com
 E: ghost@cs.msu.su
 D: Made inst_iterator behave like a proper iterator, LowerConstantExprs pass
 
-N: QIU Chaofan
-E: qiucofan@cn.ibm.com
-D: PowerPC Backend Developer
-
 N: Kalle Raiskila
 E: kalle.rasikila@nokia.com
 D: Some bugfixes to CellSPU