diff --git a/.mailmap b/.mailmap
index 176329e4b6006..2be313ecf2c95 100644
--- a/.mailmap
+++ b/.mailmap
@@ -28,6 +28,7 @@
 <hans@hanshq.net> <hans@chromium.org>
 <i@maskray.me> <maskray@google.com>
 <JCTremoulet@gmail.com> <jotrem@microsoft.com>
+<minyihh@uci.edu> <min@myhsu.dev>
 <qiucofan@cn.ibm.com> <qiucf@cn.ibm.com>
 <rnk@google.com> <reid@kleckner.net>
 <thakis@chromium.org> <nicolasweber@gmx.de>
diff --git a/llvm/CODE_OWNERS.TXT b/llvm/CODE_OWNERS.TXT
index 90bddd7481a09..b0a4387d5a6fd 100644
--- a/llvm/CODE_OWNERS.TXT
+++ b/llvm/CODE_OWNERS.TXT
@@ -116,8 +116,7 @@ E: lhames@gmail.com
 D: MCJIT, RuntimeDyld and JIT event listeners, Orcish Warchief
 
 N: Min-Yih Hsu
-E: minyihh@uci.edu
-E: yihshyng223@gmail.com
+E: min@myhsu.dev
 D: M68k Target (lib/Target/M68k/*)
 
 N: Teresa Johnson