diff --git a/compiler-rt/Maintainers.txt b/compiler-rt/Maintainers.txt
index bd51a1073cc38..63d98bc08692d 100644
--- a/compiler-rt/Maintainers.txt
+++ b/compiler-rt/Maintainers.txt
@@ -36,11 +36,15 @@ N: Teresa Johnson
 E: tejohnson@google.com
 D: MemProf
 
-N: Kostya Kortchinsky
+N: Christopher Ferris
+E: cferris@google.com
+D: SCUDO, GWP ASAN
+
+N: Kostya Kortchinsky (Emeritus)
 E: kostya.kortchinsky@gmail.com
 D: SCUDO
 
-N: Mitch Phillips
+N: Mitch Phillips (Emeritus)
 E: mitchp@google.com
 D: GWP ASAN
 
@@ -48,7 +52,7 @@ N: Alexander Potapenko
 E: glider@google.com
 D: Sanitizers
 
-N: Kostya Serebryany
+N: Kostya Serebryany (Emeritus)
 E: kcc@google.com
 D: AddressSanitizer, sanitizer_common, LeakSanitizer, LibFuzzer
 
@@ -56,7 +60,7 @@ N: Richard Smith
 E: richard-llvm@metafoo.co.uk
 D: UndefinedBehaviorSanitizer
 
-N: Evgeniy Stepanov
+N: Evgeniy Stepanov (Emeritus)
 E: eugenis@google.com
 D: MemorySanitizer, Android port of sanitizers
 
diff --git a/llvm/Maintainers.md b/llvm/Maintainers.md
index 881d4c3944bbd..bb6cd5f899656 100644
--- a/llvm/Maintainers.md
+++ b/llvm/Maintainers.md
@@ -95,15 +95,10 @@ chandlerc@gmail.com, chandlerc@google.com (email), [chandlerc](https://github.co
 
 ### Instrumentation and sanitizers
 
-#### AddressSanitizer, ThreadSanitizer
+#### Sanitizers not covered by someone else
 
-Kostya Serebryany \
-kcc@google.com (email), [kcc](https://github.com/kcc) (GitHub)
-
-#### MemorySanitizer
-
-Evgeniy Stepanov \
-eugenis@google.com (email), [eugenis](https://github.com/eugenis) (GitHub)
+Vitaly Buka \
+vitalybuka@google.com (email), [vitalybuka](https://github.com/vitalybuka) (GitHub)
 
 #### NumericalStabilitySanitizer
 
@@ -470,6 +465,8 @@ Evan Cheng (evan.cheng@apple.com) -- Parts of code generator not covered by some
 Renato Golin (rengolin@systemcall.eu, [rengolin](https://github.com/rengolin)) -- ARM backend \
 Anton Korobeynikov (anton@korobeynikov.info, [asl](https://github.com/asl)) -- ARM EABI \
 Hans Wennborg (hans@chromium.org, [zmodem](https://github.com/zmodem)) -- Release management \
+Kostya Serebryany ([kcc](https://github.com/kcc)) - Sanitizers
+Evgeniy Stepanov ([eugenis](https://github.com/eugenis)) - Sanitizers
 
 ### Former maintainers of removed components