diff --git a/compiler-rt/CODE_OWNERS.TXT b/compiler-rt/CODE_OWNERS.TXT
--- a/compiler-rt/CODE_OWNERS.TXT
+++ b/compiler-rt/CODE_OWNERS.TXT
@@ -8,33 +8,53 @@
 (W), PGP key ID and fingerprint (P), description (D), and snail-mail address
 (S).
 
+N: Saleem Abdulrasool
+E: compnerd@compnerd.org
+D: builtins library
+
+N: Dean Michael Berris
+E: dberris@google.com
+D: X-Ray
+
+N: Vitaly Buka
+E: vitalybuka@google.com
+D: Sanitizers
+
 N: Peter Collingbourne
 E: peter@pcc.me.uk
-D: DataFlowSanitizer
+D: DataFlowSanitizer, CFI, SafeStack
 
-N: Daniel Dunbar
-E: daniel@zuster.org
-D: Makefile build
+N: Lang Hames
+E: lhames@gmail.com
+D: ORC
 
-N: Timur Iskhodzhanov
-E: timurrrr@google.com
-D: AddressSanitizer for Windows
+N: Petr Hosek
+E: phosek@google.com
+D: CRT, CMake build
 
-N: Saleem Abdulrasool
-E: compnerd@compnerd.org
-D: builtins library
+N: Teresa Johnson 
+E: tejohnson@google.com
+D: MemProf
+
+N: Kostya Kortchinsky
+E: kostya.kortchinsky@gmail.com
+D: SCUDO
+
+N: David Li
+E: davidxl@google.com
+D: Profile runtime library
+
+N: Mitch Phillips
+E: mitchp@google.com
+D: GWP ASAN
 
 N: Alexander Potapenko
 E: glider@google.com
-D: MacOS/iOS port of sanitizers
-
-N: Alexey Samsonov
-E: samsonov@google.com
-D: CMake build, test suite
+D: Sanitizers
 
 N: Kostya Serebryany
 E: kcc@google.com
-D: AddressSanitizer, sanitizer_common, porting sanitizers to another platforms, LeakSanitizer
+D: AddressSanitizer, sanitizer_common, LeakSanitizer, LibFuzzer
 
 N: Richard Smith
 E: richard-llvm@metafoo.co.uk
@@ -47,7 +67,3 @@
 N: Dmitry Vyukov
 E: dvyukov@google.com
 D: ThreadSanitizer
-
-N: Bill Wendling
-E: isanbard@gmail.com
-D: Profile runtime library