diff --git a/libcxx/Maintainers.md b/libcxx/Maintainers.md
index 2630ed900111..d47a8e3b0ea8 100644
--- a/libcxx/Maintainers.md
+++ b/libcxx/Maintainers.md
@@ -4,7 +4,80 @@ This file is a list of the
 [maintainers](https://llvm.org/docs/DeveloperPolicy.html#maintainers) for
 libc++.
 
-# Lead maintainer
+## Lead maintainer
 
-Louis Dionne \
-ldionne.2@gmail.com (email), [ldionne](https://github.com/ldionne) (GitHub)
\ No newline at end of file
+Responsible for project as a whole, and for any areas not covered by a specific maintainer.
+
+Louis Dionne
+ldionne.2@gmail.com (email), [ldionne](https://github.com/ldionne) (GitHub)
+
+## Components
+
+These maintainers are responsible for particular high-level components within libc++.
+The maintainership is not exclusive, in the sense that most contributors work across
+various components of the library.
+
+### ABI Questions
+
+Louis Dionne
+ldionne.2@gmail.com (email), [ldionne](https://github.com/ldionne) (GitHub)
+
+Nikolas Klauser
+nikolasklauser@berlin.de (email), [philnik777](https://github.com/philnik777) (GitHub)
+
+### ISO C++ Conformance Status, LWG Issues
+
+An Jiang
+de34@live.cn (email), [frederick-vs-ja](https://github.com/frederick-vs-ja) (GitHub)
+
+Hristo Hristov
+hghristov.rmm@gmail.com (email), [H-G-Hristov](https://github.com/H-G-Hristov) (GitHub)
+
+### `<algorithm>`
+
+Nikolas Klauser
+nikolasklauser@berlin.de (email), [philnik777](https://github.com/philnik777) (GitHub)
+
+### Hardening
+
+Konstantin Varlamov
+varconst@apple.com (email), [var-const](https://github.com/var-const) (GitHub)
+
+### Synchronization library and `<atomic>`
+
+Hui Xie
+hui.xie1990@gmail.com (email), [huixie90](https://github.com/huixie90) (GitHub)
+
+Damien Lebrun-Grandie
+dalg24@gmail.com (email), [dalg24](https://github.com/dalg24) (GitHub)
+
+### `<mdspan>`
+
+Damien Lebrun-Grandie
+dalg24@gmail.com (email), [dalg24](https://github.com/dalg24) (GitHub)
+
+### Flat containers
+
+Hui Xie
+hui.xie1990@gmail.com (email), [huixie90](https://github.com/huixie90) (GitHub)
+
+### PSTL
+
+Nikolas Klauser
+nikolasklauser@berlin.de (email), [philnik777](https://github.com/philnik777) (GitHub)
+
+Louis Dionne
+ldionne.2@gmail.com (email), [ldionne](https://github.com/ldionne) (GitHub)
+
+### CI
+
+Louis Dionne
+ldionne.2@gmail.com (email), [ldionne](https://github.com/ldionne) (GitHub)
+
+Nikolas Klauser
+nikolasklauser@berlin.de (email), [philnik777](https://github.com/philnik777) (GitHub)
+
+### CMake
+
+Louis Dionne
+ldionne.2@gmail.com (email), [ldionne](https://github.com/ldionne) (GitHub)