diff --git a/llvm/CODE_OWNERS.TXT b/llvm/CODE_OWNERS.TXT
deleted file mode 100644
index 5b4df555fd666..0000000000000
--- a/llvm/CODE_OWNERS.TXT
+++ /dev/null
@@ -1,269 +0,0 @@
-This file is a list of the people responsible for ensuring that patches for a
-particular part of LLVM are reviewed, either by themself or by someone else.
-They are also the gatekeepers for their part of LLVM, 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), web-address
-(W), PGP key ID and fingerprint (P), description (D), snail-mail address
-(S) and (I) IRC handle. Each entry should contain at least the (N), (E) and
-(D) fields.
-
-N: Paul C. Anagnostopoulos
-E: paul@windfall.com
-D: TableGen
-
-N: Matt Arsenault
-E: Matthew.Arsenault@amd.com
-E: arsenm2@gmail.com
-I: arsenm
-D: AMDGPU, InferAddressSpaces
-
-N: Justin Bogner
-E: mail@justinbogner.com
-D: InstrProfiling and related parts of ProfileData
-D: SelectionDAG (lib/CodeGen/SelectionDAG/*)
-
-N: Alex Bradbury
-E: asb@igalia.com
-D: RISC-V backend (lib/Target/RISCV/*)
-
-N: Matthias Braun
-E: matze@braunis.de
-I: MatzeB
-D: Instruction Scheduling
-
-N: Chandler Carruth
-E: chandlerc@gmail.com
-E: chandlerc@google.com
-D: Config, ADT, Support, inlining & related passes, SROA/mem2reg & related passes, CMake, library layering
-
-N: Evan Cheng
-E: evan.cheng@apple.com
-D: parts of code generator not covered by someone else
-
-N: Eric Christopher
-E: echristo@gmail.com
-D: Debug Information, inline assembly
-
-N: Andrey Churbanov
-E: andrey.churbanov@intel.com
-D: OpenMP runtime library
-
-N: Johannes Doerfert
-E: jdoerfert@llnl.gov
-D: OpenMP target offloading, OpenMP-Opt, Attributor
-
-N: Greg Clayton
-E: clayborg@gmail.com
-D: LLDB
-
-N: Louis Dionne
-E: ldionne.2@gmail.com
-D: libc++
-
-N: Peter Collingbourne
-E: peter@pcc.me.uk
-D: libLTO (lib/LTO/* tools/lto/*), LLVM Bitcode (lib/Bitcode/* include/llvm/Bitcode/*)
-
-N: Quentin Colombet
-E: quentin.colombet@gmail.com
-D: Loop Strength Reduction, Register allocators
-
-N: Andrea Di Biagio
-E: andrea.dibiagio@sony.com
-E: andrea.dibiagio@gmail.com
-D: MCA, llvm-mca
-
-N: Hal Finkel
-E: hfinkel@anl.gov
-D: The loop reroller and alias analysis
-
-N: Zheng Chen
-E: czhengsz@cn.ibm.com
-D: PowerPC Backend
-
-N: Dan Gohman
-E: llvm@sunfishcode.online
-D: WebAssembly Backend (lib/Target/WebAssembly/*)
-
-N: Renato Golin
-E: rengolin@systemcall.eu
-D: ARM Linux support
-
-N: Venkatraman Govindaraju
-E: venkatra@cs.wisc.edu
-D: Sparc Backend (lib/Target/Sparc/*)
-
-N: Tobias Grosser
-E: tobias@grosser.es
-D: Polly
-
-N: James Grosbach
-E: grosbach@apple.com
-D: MC layer
-
-N: Justin Holewinski
-E: jholewinski@nvidia.com
-D: NVPTX Target (lib/Target/NVPTX/*)
-
-N: Lang Hames
-E: lhames@gmail.com
-D: MCJIT, RuntimeDyld and JIT event listeners, Orcish Warchief
-
-N: Min-Yih Hsu
-E: min@myhsu.dev
-D: M68k Target (lib/Target/M68k/*)
-
-N: Cyndy Ishida
-E: cyndyishida@gmail.com
-D: TextAPI (lib/TextAPI/*) and related TAPI tools
-
-N: Teresa Johnson
-E: tejohnson@google.com
-D: Gold plugin (tools/gold/*) and IR Linker
-
-N: Galina Kistanova
-E: gkistanova@gmail.com
-D: LLVM Buildbot
-
-N: Anton Korobeynikov
-E: anton@korobeynikov.info
-D: Exception handling, Windows codegen, ARM EABI, MSP430 Target (lib/Target/MSP430/*)
-
-N: Benjamin Kramer
-E: benny.kra@gmail.com
-D: DWARF Parser
-
-N: Sundeep Kushwaha
-E: sundeepk@quicinc.com
-D: Hexagon Backend
-
-N: Florian Hahn
-E: flo@fhahn.com
-D: Loop Vectorizer
-
-N: Alexey Bataev
-E: a.bataev@outlook.com
-D: SLP Vectorizer
-
-N: Sergei Larin
-E: slarin@codeaurora.org
-D: VLIW Instruction Scheduling, Packetization
-
-N: Chris Lattner
-E: sabre@nondot.org
-W: http://nondot.org/~sabre/
-D: Everything not covered by someone else
-
-N: Weining Lu
-E: luweining@loongson.cn
-D: LoongArch backend (lib/Target/LoongArch/*)
-
-N: David Majnemer
-E: david.majnemer@gmail.com
-D: IR Constant Folder, InstCombine
-
-N: Ben Shi
-E: 2283975856@qq.com, powerman1st@163.com
-D: AVR Backend
-
-N: Kazushi Marukawa
-E: marukawa@nec.com
-D: VE Backend
-
-N: Tim Northover
-E: t.p.northover@gmail.com
-D: AArch64 backend, misc ARM backend
-
-N: Diego Novillo
-E: dnovillo@google.com
-D: SampleProfile and related parts of ProfileData
-
-N: Nigel Perks
-E: nigelp@xmos.com
-D: XCore Backend
-
-N: Jacques Pienaar
-E: jpienaar@google.com
-D: Lanai Backend
-
-N: Simon Pilgrim
-E: llvm-dev@redking.me.uk
-D: X86 Backend
-
-N: Philip Reames
-E: listmail@philipreames.com
-D: IndVar Simplify, Scalar Evolution
-
-N: Paul Robinson
-E: paul.robinson@sony.com
-D: Sony PlayStation®4 support
-
-N: Chad Rosier
-E: mcrosier@codeaurora.org
-D: Fast-Isel
-
-N: Andrei Safronov
-E: andrei.safronov@espressif.com
-D: Xtensa backend (lib/Target/Xtensa/*)
-
-N: Duncan Sands
-E: baldrick@free.fr
-D: DragonEgg
-
-N: Mark Schimmel
-E: marksl@synopsys.com
-D: ARC backend (lib/Target/ARC/*)
-
-N: Kostya Serebryany
-E: kcc@google.com
-D: AddressSanitizer, ThreadSanitizer (LLVM parts)
-
-N: Michael Spencer
-E: bigcheesegs@gmail.com
-D: Windows parts of Support, Object, ar, nm, objdump, ranlib, size
-
-N: Alexei Starovoitov
-E: alexei.starovoitov@gmail.com
-D: BPF backend
-
-N: Tom Stellard
-E: tstellar@redhat.com
-D: Stable release management (x.y.[1-9] releases), libclc
-
-N: Evgeniy Stepanov
-E: eugenis@google.com
-D: MemorySanitizer (LLVM part)
-
-N: Phoebe Wang
-E: phoebe.wang@intel.com
-D: X86 Backend
-
-N: Ulrich Weigand
-E: uweigand@de.ibm.com
-D: SystemZ Backend
-
-N: Hans Wennborg
-E: hans@chromium.org
-D: Release management (x.y.0 releases)
-
-N: Jake Ehrlich
-E: jakehehrlich@google.com
-D: llvm-objcopy (tools/llvm-objcopy)
-
-N: Martin Storsjö
-E: martin@martin.st
-D: MinGW
-
-N: Zi Xuan Wu (Zeson)
-E: zixuan.wu@linux.alibaba.com
-D: C-SKY backend (lib/Target/CSKY/*)
-
-N: Ilia Diachkov
-E: ilia.diachkov@gmail.com
-D: SPIR-V backend (lib/Target/SPIRV/*)
-
-N: Christopher Apple, David Trevelyan
-E: cja-private@pm.me, david.trevelyan@gmail.com
-D: RealtimeSanitizer (LLVM part)
diff --git a/llvm/Maintainers.md b/llvm/Maintainers.md
new file mode 100644
index 0000000000000..b2599ab51fdd1
--- /dev/null
+++ b/llvm/Maintainers.md
@@ -0,0 +1,435 @@
+# LLVM Maintainers
+
+This file is a list of the
+[maintainers](https://llvm.org/docs/DeveloperPolicy.html#maintainers) for
+LLVM.
+
+## Current 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.
+
+**Warning: The maintainer list for LLVM is currently not up to date.**
+
+### Lead maintainer
+
+The lead maintainer is responsible for all parts of LLVM not covered by somebody else.
+
+Chris Lattner \
+sabre@nondot.org (email), [lattner](https://github.com/lattner) (GitHub), clattner (Discourse)
+
+### Transforms and analyses
+
+#### AliasAnalysis
+
+Hal Finkel \
+hfinkel@anl.gov (email), [hfinkel](https://github.com/hfinkel) (GitHub)
+
+#### Attributor, OpenMPOpt
+
+Johannes Doerfert \
+jdoerfert@llnl.gov (email), [jdoerfert](https://github.com/jdoerfert) (GitHub)
+
+#### InferAddressSpaces
+
+Matt Arsenault \
+Matthew.Arsenault@amd.com, arsenm2@gmail.com (email), [arsenm](https://github.com/arsenm) (GitHub)
+
+#### Inlining
+
+Chandler Carruth \
+chandlerc@gmail.com, chandlerc@google.com (email), [chandlerc](https://github.com/chandlerc) (GitHub)
+
+#### InstCombine, ConstantFold
+
+David Majnemer \
+david.majnemer@gmail.com (email), [majnemer](https://github.com/majnemer) (GitHub)
+
+#### InstrProfiling and related parts of ProfileData
+
+Justin Bogner \
+mail@justinbogner.com (email), [bogner](https://github.com/bogner) (GitHub)
+
+#### SampleProfile and related parts of ProfileData
+
+Diego Novillo \
+dnovillo@google.com (email), [dnovillo](https://github.com/dnovillo) (GitHub)
+
+#### LoopStrengthReduce
+
+Quentin Colombet \
+quentin.colombet@gmail.com (email), [qcolombet](https://github.com/qcolombet) (GitHub)
+
+#### LoopVectorize
+
+Florian Hahn \
+flo@fhahn.com (email), [fhahn](https://github.com/fhahn) (GitHub)
+
+#### ScalarEvolution, IndVarSimplify
+
+Philip Reames \
+listmail@philipreames.com (email), [preames](https://github.com/preames) (GitHub)
+
+#### SLPVectorizer
+
+Alexey Bataev \
+a.bataev@outlook.com (email), [alexey-bataev](https://github.com/alexey-bataev) (GitHub)
+
+#### SROA, Mem2Reg
+
+Chandler Carruth \
+chandlerc@gmail.com, chandlerc@google.com (email), [chandlerc](https://github.com/chandlerc) (GitHub)
+
+### Instrumentation and sanitizers
+
+#### AddressSanitizer, ThreadSanitizer
+
+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)
+
+#### RealtimeSanitizer
+
+Christopher Apple \
+cja-private@pm.me (email), [cjappl](https://github.com/cjappl) (GitHub) \
+David Trevelyan \
+david.trevelyan@gmail.com (email), [davidtrevelyan](https://github.com/davidtrevelyan) (GitHub)
+
+### Generic backend and code generation
+
+#### Parts of code generator not covered by someone else
+
+Evan Cheng \
+evan.cheng@apple.com (email)
+
+#### SelectionDAG
+
+Justin Bogner \
+mail@justinbogner.com (email), [bogner](https://github.com/bogner) (GitHub)
+
+#### FastISel
+
+Chad Rosier \
+mcrosier@codeaurora.org (email)
+
+#### Instruction scheduling
+
+Matthias Braun \
+matze@braunis.de (email), [MatzeB](https://github.com/MatzeB) (GitHub)
+
+#### VLIW Instruction Scheduling, Packetization
+
+Sergei Larin \
+slarin@codeaurora.org (email)
+
+#### Register allocation
+
+Quentin Colombet \
+quentin.colombet@gmail.com (email), [qcolombet](https://github.com/qcolombet) (GitHub)
+
+#### MC layer
+
+James Grosbach \
+grosbach@apple.com (email)
+
+#### Windows codegen
+
+Anton Korobeynikov \
+anton@korobeynikov.info (email), [asl](https://github.com/asl) (GitHub)
+
+### Backends / Targets
+
+#### AArch64 backend
+
+Tim Northover \
+t.p.northover@gmail.com (email), [TNorthover](https://github.com/TNorthover) (GitHub)
+
+#### AMDGPU backend
+
+Matt Arsenault \
+Matthew.Arsenault@amd.com, arsenm2@gmail.com (email), [arsenm](https://github.com/arsenm) (GitHub)
+
+#### ARC backend
+
+Mark Schimmel \
+marksl@synopsys.com (email), [markschimmel](https://github.com/markschimmel) (GitHub)
+
+#### ARM backend
+
+Renato Golin \
+rengolin@systemcall.eu (email), [rengolin](https://github.com/rengolin) (GitHub)
+
+#### AVR backend
+
+Ben Shi \
+2283975856@qq.com, powerman1st@163.com (email), [benshi001](https://github.com/benshi001) (GitHub)
+
+#### BPF backend
+
+Alexei Starovoitov \
+alexei.starovoitov@gmail.com (email), [4ast](https://github.com/4ast) (GitHub)
+
+#### CSKY backend
+
+Zi Xuan Wu (Zeson) \
+zixuan.wu@linux.alibaba.com (email), [zixuan-wu](https://github.com/zixuan-wu) (GitHub)
+
+#### Hexagon backend
+
+Sundeep Kushwaha \
+sundeepk@quicinc.com (email)
+
+#### Lanai backend
+
+Jacques Pienaar \
+jpienaar@google.com (email), [jpienaar](https://github.com/jpienaar) (GitHub)
+
+#### LoongArch backend
+
+Weining Lu \
+luweining@loongson.cn (email), [SixWeining](https://github.com/SixWeining) (GitHub)
+
+#### M68k backend
+
+Min-Yih Hsu \
+min@myhsu.dev (email), [mshockwave](https://github.com/mshockwave) (GitHub)
+
+#### MSP430 backend
+
+Anton Korobeynikov \
+anton@korobeynikov.info (email), [asl](https://github.com/asl) (GitHub)
+
+#### NVPTX backend
+
+Justin Holewinski \
+jholewinski@nvidia.com (email), [jholewinski](https://github.com/jholewinski) (GitHub)
+
+#### PowerPC backend
+
+Zheng Chen \
+czhengsz@cn.ibm.com (email), [chenzheng1030](https://github.com/chenzheng1030) (GitHub)
+
+#### RISCV backend
+
+Alex Bradbury \
+asb@igalia.com (email), [asb](https://github.com/asb) (GitHub)
+
+#### Sparc backend
+
+Venkatraman Govindaraju \
+venkatra@cs.wisc.edu (email), [vegovin](https://github.com/vegovin) (GitHub)
+
+#### SPIRV backend
+
+Ilia Diachkov \
+ilia.diachkov@gmail.com (email), [iliya-diyachkov](https://github.com/iliya-diyachkov) (GitHub)
+
+#### SystemZ backend
+
+Ulrich Weigand \
+uweigand@de.ibm.com (email), [uweigand](https://github.com/uweigand) (GitHub)
+
+#### VE backend
+
+Kazushi Marukawa \
+marukawa@nec.com (email), [kaz7](https://github.com/kaz7) (GitHub)
+
+#### WebAssembly backend
+
+Dan Gohman \
+llvm@sunfishcode.online (email), [sunfishcode](https://github.com/sunfishcode) (GitHub)
+
+#### X86 backend
+
+Simon Pilgrim \
+llvm-dev@redking.me.uk (email), [RKSimon](https://github.com/RKSimon) (GitHub) \
+Phoebe Wang \
+phoebe.wang@intel.com (email), [phoebewang](https://github.com/phoebewang) (GitHub)
+
+#### XCore backend
+
+Nigel Perks \
+nigelp@xmos.com (email), [nigelp-xmos](https://github.com/nigelp-xmos) (GitHub)
+
+#### Xtensa backend
+
+Andrei Safronov \
+andrei.safronov@espressif.com (email), [andreisfr](https://github.com/andreisfr) (GitHub)
+
+### Libraries and shared infrastructure
+
+#### ADT, Support
+
+Chandler Carruth \
+chandlerc@gmail.com, chandlerc@google.com (email), [chandlerc](https://github.com/chandlerc) (GitHub)
+
+#### Bitcode
+
+Peter Collingbourne \
+peter@pcc.me.uk (email), [pcc](https://github.com/pcc) (GitHub)
+
+#### CMake and library layering
+
+Chandler Carruth \
+chandlerc@gmail.com, chandlerc@google.com (email), [chandlerc](https://github.com/chandlerc) (GitHub)
+
+#### Debug info
+
+Eric Christopher \
+echristo@gmail.com (email), [echristo](https://github.com/echristo) (GitHub)
+
+#### DWARF Parser
+
+Benjamin Kramer \
+benny.kra@gmail.com (email), [d0k](https://github.com/d0k) (GitHub)
+
+#### IR Linker
+
+Teresa Johnson \
+tejohnson@google.com (email), [teresajohnson](https://github.com/teresajohnson) (GitHub)
+
+#### LTO
+
+Peter Collingbourne \
+peter@pcc.me.uk (email), [pcc](https://github.com/pcc) (GitHub)
+
+#### MCJIT, Orc, RuntimeDyld, PerfJITEvents
+
+Lang Hames \
+lhames@gmail.com (email), [lhames](https://github.com/lhames) (GitHub)
+
+#### TableGen
+
+Paul C. Anagnostopoulos \
+paul@windfall.com (email)
+
+#### TextAPI
+
+Cyndy Ishida \
+cyndyishida@gmail.com (email), [cyndyishida](https://github.com/cyndyishida) (GitHub)
+
+### Tools
+
+#### llvm-mca and MCA library
+
+Andrea Di Biagio \
+andrea.dibiagio@sony.com, andrea.dibiagio@gmail.com (email), [adibiagio](https://github.com/adibiagio) (GitHub)
+
+#### llvm-objcopy and ObjCopy library
+
+Jake Ehrlich \
+jakehehrlich@google.com (email), [jakehehrlich](https://github.com/jakehehrlich) (GitHub)
+
+#### Gold plugin
+
+Teresa Johnson \
+tejohnson@google.com (email), [teresajohnson](https://github.com/teresajohnson) (GitHub)
+
+### Other
+
+#### Release management
+
+For x.y.0 releases:
+
+Hans Wennborg \
+hans@chromium.org (email), [zmodem](https://github.com/zmodem) (GitHub)
+
+For x.y.\[1-9\] releases:
+
+Tom Stellard \
+tstellar@redhat.com (email), [tstellar](https://github.com/tstellar) (GitHub)
+
+#### MinGW support
+
+Martin Storsjö \
+martin@martin.st (email), [mstrorsjo](https://github.com/mstrorsjo) (GitHub)
+
+#### Windows support in object tools
+
+Michael Spencer \
+bigcheesegs@gmail.com (email), [Bigcheese](https://github.com/Bigcheese) (GitHub)
+
+#### Sony PlayStation®4 support
+
+Paul Robinson \
+paul.robinson@sony.com (email), [pogo59](https://github.com/pogo59) (GitHub)
+
+#### Inline assembly
+
+Eric Christopher \
+echristo@gmail.com (email), [echristo](https://github.com/echristo) (GitHub)
+
+#### Exception handling
+
+Anton Korobeynikov \
+anton@korobeynikov.info (email), [asl](https://github.com/asl) (GitHub)
+
+#### ARM EABI
+
+Anton Korobeynikov \
+anton@korobeynikov.info (email), [asl](https://github.com/asl) (GitHub)
+
+#### LLVM Buildbot
+
+Galina Kistanova \
+gkistanova@gmail.com (email), [gkistanova](https://github.com/gkistanova) (GitHub)
+
+### Other subprojects
+
+Some subprojects maintain their own list of per-component maintainers.
+Others only have a lead maintainer listed here.
+
+[Bolt maintainers](https://github.com/llvm/llvm-project/blob/main/bolt/CODE_OWNERS.TXT)
+
+[Clang maintainers](https://github.com/llvm/llvm-project/blob/main/clang/CodeOwners.rst)
+
+[Clang-tools-extra maintainers](https://github.com/llvm/llvm-project/blob/main/clang-tools-extra/CODE_OWNERS.TXT)
+
+[Compiler-rt maintainers](https://github.com/llvm/llvm-project/blob/main/compiler-rt/CODE_OWNERS.TXT)
+
+[Flang maintainers](https://github.com/llvm/llvm-project/blob/main/flang/CODE_OWNERS.TXT)
+
+[LLD maintainers](https://github.com/llvm/llvm-project/blob/main/lld/CODE_OWNERS.TXT)
+
+[LLDB maintainers](https://github.com/llvm/llvm-project/blob/main/lldb/CodeOwners.rst)
+
+#### libc++
+
+Louis Dionne \
+ldionne.2@gmail.com (email), [ldionne](https://github.com/ldionne) (GitHub)
+
+#### libclc
+
+Tom Stellard \
+tstellar@redhat.com (email), [tstellar](https://github.com/tstellar) (GitHub)
+
+#### OpenMP (runtime library)
+
+Andrey Churbanov \
+andrey.churbanov@intel.com (email), [AndreyChurbanov](https://github.com/AndreyChurbanov) (GitHub)
+
+#### Polly
+
+Tobias Grosser \
+tobias@grosser.es (email), [tobiasgrosser](https://github.com/tobiasgrosser) (GitHub)
+
+## Inactive Maintainers
+
+The following people have graciously spent time performing maintainer
+responsibilities but are no longer active in that role. Thank you for all your
+help with the success of the project!
+
+### Emeritus lead maintainers
+
+### Inactive component maintainers
+
+### Former maintainers of removed components
+
+Duncan Sands (baldrick@free.fr, [CunningBaldrick](https://github.com/CunningBaldrick)) -- DragonEgg \
+Hal Finkel (hfinkel@anl.gov, [hfinkel](https://github.com/hfinkel)) -- LoopReroll
+