diff --git a/CODE_OWNERS.TXT b/CODE_OWNERS.TXT
index 5e54cfae723..025fe4f29cc 100644
--- a/CODE_OWNERS.TXT
+++ b/CODE_OWNERS.TXT
@@ -40,7 +40,7 @@ E: hfinkel@anl.gov
 D: BBVectorize and the PowerPC target
 
 N: Doug Gregor
-D: Clang Frontend Libraries
+D: All parts of Clang not covered by someone else
 
 N: Tobias Grosser
 D: Polly
@@ -107,6 +107,10 @@ N: Duncan Sands
 E: baldrick@free.fr
 D: DragonEgg
 
+N: Richard Smith
+E: richard@metafoo.co.uk
+D: Clang Semantic Analysis (tools/clang/lib/Sema/* tools/clang/include/clang/Sema/*)
+
 N: Andrew Trick
 E: atrick@apple.com
 D: Instruction Scheduling