diff --git a/llvm/CODE_OWNERS.TXT b/llvm/CODE_OWNERS.TXT
index 111524216ced..31842fc9873a 100644
--- a/llvm/CODE_OWNERS.TXT
+++ b/llvm/CODE_OWNERS.TXT
@@ -163,10 +163,6 @@ N: Chad Rosier
 E: mcrosier@codeaurora.org
 D: Fast-Isel
 
-N: Nadav Rotem
-E: nadav.rotem@me.com
-D: X86 Backend
-
 N: Duncan Sands
 E: baldrick@free.fr
 D: DragonEgg
@@ -192,6 +188,10 @@ N: Evgeniy Stepanov
 E: eugenis@google.com
 D: MemorySanitizer (LLVM part)
 
+N: Craig Topper
+E: craig.topper@gmail.com
+D: X86 Backend
+
 N: Andrew Trick
 E: atrick@apple.com
 D: Loop Strength Reduction, Instruction Scheduling