diff --git a/llvm/CODE_OWNERS.TXT b/llvm/CODE_OWNERS.TXT
--- a/llvm/CODE_OWNERS.TXT
+++ b/llvm/CODE_OWNERS.TXT
@@ -161,8 +161,8 @@
 E: me@dylanmckay.io
 D: AVR Backend
 
-N: Simon Moll
-E: simon.moll@emea.nec.com
+N: Kazushi Marukawa
+E: marukawa@nec.com
 D: VE Backend
 
 N: Tim Northover