diff --git a/docs/CODEOWNERS b/docs/CODEOWNERS
index baab4a604..41e657dfb 100644
--- a/docs/CODEOWNERS
+++ b/docs/CODEOWNERS
@@ -16,6 +16,11 @@
#
# If you want to be responsible for code reviews in specific sections of
# the GLib code base, add yourself here.
+#
+# Everyone listed in this file is a co-maintainer of GLib, even if they only
+# concern themselves with one section of the code base. All usernames listed
+# here should therefore also be listed in glib.doap, so that GitLab access
+# control is correct.
# Overall maintainers
* @pwithnall @ebassi @3v1n0
diff --git a/glib.doap b/glib.doap
index c4d29cfc0..fec140168 100644
--- a/glib.doap
+++ b/glib.doap
@@ -29,14 +29,6 @@
-
-
- Allison Ryan Lortie
-
- desrt
-
-
-
Philip Withnall
@@ -62,6 +54,126 @@
+
+
+ Sebastian Dröge
+
+ sdroege
+
+
+
+
+
+ Alexander Larsson
+
+ alexl
+
+
+
+
+
+ Ondrej Holy
+
+ oholy
+
+
+
+
+
+ Simon McVittie
+
+ smcv
+
+
+
+
+
+ Michael Catanzaro
+
+ mcatanzaro
+
+
+
+
+
+ Patrick Griffis
+
+ pgriffis
+
+
+
+
+
+ Jonathan Matthew
+
+ jmatthew
+
+
+
+
+
+ Antoine Jacoutot
+
+ ajacoutot
+
+
+
+
+
+ Ting-Wei Lan
+
+ lantw
+
+
+
+
+
+ Nirbheek Chauhan
+
+ nirbheekc
+
+
+
+
+
+ Chun-wei Fan
+
+ fanchunwei
+
+
+
+
+
+ Christoph Reiter
+
+ creiter
+
+
+
+
+
+ Руслан Ижбулатов
+
+ ruslanizhb
+
+
+
+
+
+ John Ralls
+
+ jralls
+
+
+
+
+
+ Xavier Claessens
+
+ xclaesse
+
+
+