diff --git a/clang-tools-extra/CODE_OWNERS.TXT b/clang-tools-extra/CODE_OWNERS.TXT
deleted file mode 100644
index 2831ec7e25f5..000000000000
--- a/clang-tools-extra/CODE_OWNERS.TXT
+++ /dev/null
@@ -1,30 +0,0 @@
-This file is a list of the people responsible for ensuring that patches for a
-particular tool are reviewed, either by themself or by someone else. They are
-also the gatekeepers for their part of Clang, with the final word on what goes
-in or not.
-
-The list is sorted by surname and formatted to allow easy grepping and
-beautification by scripts.  The fields are: name (N), email (E), Phabricator
-handle (H), and description (D).
-
-N: Aaron Ballman
-E: aaron@aaronballman.com
-H: aaron.ballman
-D: clang-query
-
-N: Julie Hockett
-E: juliehockett@google.com
-D: clang-doc
-
-N: Nathan James
-E: n.james93@hotmail.co.uk
-H: njames93
-D: clang-tidy
-
-N: Manuel Klimek
-E: klimek@google.com
-D: all parts of clang-tools-extra not covered by someone else
-
-N: Sam McCall
-E: sammccall@google.com
-D: clangd
diff --git a/clang-tools-extra/Maintainers.txt b/clang-tools-extra/Maintainers.txt
new file mode 100644
index 000000000000..689f2408820e
--- /dev/null
+++ b/clang-tools-extra/Maintainers.txt
@@ -0,0 +1,75 @@
+=============================
+Clang Tools Extra Maintainers
+=============================
+
+This file is a list of the maintainers
+(https://llvm.org/docs/DeveloperPolicy.html#maintainers) for clang-tools-extra.
+
+
+Active Maintainers
+==================
+The following people are the active maintainers for the project. Please reach
+out to them for code reviews, questions about their area of expertise, or other
+assistance.
+
+Lead Maintainer
+---------------
+| Aaron Ballman
+| aaron@aaronballman.com (email), aaron.ballman (Phabricator), AaronBallman (GitHub), AaronBallman (Discourse), aaronballman (Discord), AaronBallman (IRC)
+
+
+clang-tidy
+----------
+| Congcong Cai
+| congcongcai0907@163.com (email), HerrCai0907 (GitHub), HerrCai0907 (Discourse)
+
+| Julian Schmidt
+| git.julian.schmidt@gmail.com (email), 5chmidti (GitHub), 5chmidti (Discourse), 5chmidti (Discord)
+
+| Piotr Zegar
+| me@piotrzegar.pl (email), PiotrZSL (GitHub), PiotrZSL (Discourse), PiotrZSL (Discord)
+
+
+clang-query
+-----------
+| Aaron Ballman
+| aaron@aaronballman.com (email), aaron.ballman (Phabricator), AaronBallman (GitHub), AaronBallman (Discourse), aaronballman (Discord), AaronBallman (IRC)
+
+
+clang-doc
+---------
+| Paul Kirth
+| paulkirth@google.com (email), ilovepi (GitHub), ilovepi (Discourse)
+
+| Peter Chou
+| peterchou411@gmail.com (email), PeterChou1 (GitHub), PeterChou1 (Discourse), .peterchou (Discord)
+
+
+clangd
+------
+| Nathan Ridge
+| zeratul976@hotmail.com (email), HighCommander4 (GitHub), HighCommander4 (Discourse), nridge (Discord)
+
+| Chris Bieneman
+| chris.bieneman@gmail.com (email), llvm-beanz (GitHub), beanz (Discord), beanz (Discourse)
+
+| Kadir Çetinkaya
+| kadircet@google.com (email), kadircet (GitHub) kadircet (Discourse), kadircet (Discord)
+
+
+Inactive Maintainers
+====================
+The following people have graciously spent time performing maintainership
+responsibilities but are no longer active in that role. Thank you for all your
+help with the success of the project!
+
+Emeritus Lead Maintainers
+-------------------------
+| Manuel Klimek (klimek@google.com (email), r4nt (GitHub))
+
+
+Inactive component maintainers
+------------------------------
+| Nathan James (n.james93@hotmail.co.uk) -- clang-tidy
+| Julie Hockett (juliehockett@google.com) -- clang-doc
+| Sam McCall (sammccall@google.com (email), sam-mccall (GitHub, Discourse, Discord)) -- clangd