diff --git a/clang/CODE_OWNERS.TXT b/clang/CODE_OWNERS.TXT
index 13c0a9bde665..9435ba74c4bb 100644
--- a/clang/CODE_OWNERS.TXT
+++ b/clang/CODE_OWNERS.TXT
@@ -27,12 +27,16 @@ D: Exception handling, Windows codegen, ARM EABI
 N: Ted Kremenek
 D: Clang Static Analyzer
 
+N: Chris Matthews
+E: cmatthews5@apple.com
+D: The compiler driver
+
 N: John McCall
 E: rjmccall@apple.com
 D: Clang LLVM IR generation
 
 N: Chad Rosier
-E: mcrosier@apple.com
+E: chad.rosier@gmail.com
 D: MS-inline asm, and the compiler driver
 
 N: Richard Smith