diff --git a/flang/Maintainers.md b/flang/Maintainers.md
new file mode 100644
index 000000000000..f4a763538913
--- /dev/null
+++ b/flang/Maintainers.md
@@ -0,0 +1,95 @@
+# Flang maintainers
+
+This file is a list of the
+[maintainers](https://llvm.org/docs/DeveloperPolicy.html#maintainers) for
+Flang
+
+## Active maintainers
+
+### Lead 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.
+
+#### All areas not covered by others
+Steve Scalpone \
+sscalpone@nvidia.com (email), sscalpone (GitHub), sscalpone (Discourse)
+
+####  Backend (Lowering, Fortran dialects, Codegen)
+Jean Perier \
+jperier@nvidia.com (email), jeanPerier (GitHub), jeanPerier (Discourse)
+
+### Component maintainers
+These maintainers are responsible for particular high-level components within
+Flang that are typically contained to one area of the compiler.
+
+#### Driver
+Andrzej Warzyński \
+andrzej.warzynski@arm.com (email), banach-space (GitHub), banach-space (Discourse)
+
+Tarun Prabhu \
+tarun@lanl.gov (email), tarunprabhu (GitHub), tarunprabhu (Discourse)
+
+#### Alias Analysis
+Renaud Kauffmann \
+rkauffmann@nvidia.com (email), Renaud-K (GitHub), Renaud-K (Discourse)
+
+#### PFT, Block, IEEE support
+Val Donaldson \
+vdonaldson@nvidia.com (email), vdonaldson (GitHub)
+
+#### Lowering, HLFIR, FIR, Codegen
+Jean Perier \
+jperier@nvidia.com (email), jeanPerier (GitHub), jeanPerier (Discourse)
+
+Slava Zakharin \
+szakharin@nvidia.com (email), vzakhari (GitHub), szakharin (Discourse)
+
+Tom Eccles \
+tom.eccles@arm.com (email), tblah (GitHub), tblah (Discourse)
+
+Valentin Clement \
+clementval@gmail.com (email), clementval (GitHub), clementval (Discourse)
+
+#### OpenMP
+##### CPU support
+Tom Eccles \
+tom.eccles@arm.com (email), tblah (GitHub), tblah (Discourse)
+
+##### OpenMP 6.0
+Krzysztof Parzyszek \
+Krzysztof.Parzyszek@amd.com (email), kparzysz (GitHub), kparzysz (Discourse)
+
+##### Target Offload
+Sergio Afonso \
+safonsof@amd.com (email), skatrak (GitHub), skatrak (Discourse) 
+
+#### OpenACC
+Valentin Clement \
+clementval@gmail.com (email), clementval (GitHub), clementval (Discourse)
+
+Razvan Lupusoru \
+razvan.lupusoru@gmail.com (email), razvanlupusoru (GitHub), razvan.lupusoru (Discourse)
+
+#### CUDA Fortran
+Valentin Clement \
+clementval@gmail.com (email), clementval (GitHub), clementval (Discourse)
+
+#### Debug
+Abid Qadeer \
+haqadeer@amd.com (email), abidh (GitHub), abidh (Discourse)
+
+## Inactive Maintainers
+### Lead Maintainers
+#### Backend : (Lowering, FIR, Codegen)
+Eric Schweitz \
+eschweitz@nvidia.com (email), schweitzpgi (GitHub), schweitz (Discourse)
+
+### Component Maintainers
+#### Semantics
+Tim Keith
+
+#### OpenMP
+Kiran Chandramohan \
+kiran.chandramohan@arm.com (email), kiranchandramohan (GitHub),  kiranchandramohan (Discourse)
+
diff --git a/flang/Maintainers.txt b/flang/Maintainers.txt
deleted file mode 100644
index a8e2fe07a985..000000000000
--- a/flang/Maintainers.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-This file is a list of the people responsible for ensuring that patches for a
-particular part of Flang are reviewed, either by themself or by someone else.
-They are also the gatekeepers for their part of Flang, 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: Steve Scalpone
-E: sscalpone@nvidia.com
-D: Anything not covered by others
-
-N: Andrzej Warzynski
-E: andrzej.warzynski@arm.com
-D: Driver