1 files changed, 24 insertions, 23 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 22d00e1d64..9009c798f2 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -6,11 +6,23 @@
 /.github/         @maximedenes
 # Secondary maintainer @Zimmi48
 
+########## Build system ##########
+
+/Makefile*        @gares
+
+/configure*       @ejgallego
+
+/META.coq.in      @ejgallego
+
+/dev/build/windows @MSoegtropIMC
+# Secondary maintainer @maximedenes
+
 ########## CI infrastructure ##########
 
 /dev/ci/          @coq/ci-maintainers
 /.travis.yml      @coq/ci-maintainers
 /.gitlab-ci.yml   @coq/ci-maintainers
+/Makefile.ci      @coq/ci-maintainers
 
 /dev/ci/user-overlays/*.sh @ghost
 # Trick to avoid getting review requests
@@ -21,8 +33,7 @@
 /dev/ci/*.bat          @maximedenes
 # Secondary maintainer @SkySkimmer
 
-/default.nix     @Zimmi48
-# Secondary maintainer @vbgl
+*.nix             @coq/nix-maintainers
 
 ########## Documentation ##########
 
@@ -46,6 +57,7 @@
 # each time someone modifies the dev changelog
 
 /doc/             @coq/doc-maintainers
+/Makefile.doc     @coq/doc-maintainers
 
 /man/             @silene
 # Secondary maintainer @maximedenes
@@ -159,8 +171,6 @@
 /plugins/syntax/        @ppedrot
 # Secondary maintainer @maximedenes
 
-/plugins/quote/ @herbelin
-
 /plugins/rtauto/       @PierreCorbineau
 # Secondary maintainer @herbelin
 
@@ -259,6 +269,16 @@
 
 /theories/Vectors/        @herbelin
 
+########## Dune  ##########
+
+/.ocamlinit            @ejgallego
+/Makefile.dune         @ejgallego
+/tools/coq_dune*       @ejgallego
+/dune*                 @ejgallego
+/coq.opam              @ejgallego
+/ide/coqide.opam       @ejgallego
+# Secondary maintainer @Zimmi48
+
 ########## Tools ##########
 
 /tools/coqdoc/         @silene
@@ -295,25 +315,6 @@
 /vernac/          @mattam82
 # Secondary maintainer @maximedenes
 
-########## Build system ##########
-
-/Makefile*        @gares
-
-/configure*       @ejgallego
-
-/META.coq.in      @ejgallego
-
-/dev/build/windows @MSoegtropIMC
-# Secondary maintainer @maximedenes
-
-# This file belongs to CI
-/Makefile.ci       @ejgallego
-# Secondary maintainer @SkySkimmer
-
-# This file belongs to the doc
-/Makefile.doc        @maximedenes
-# Secondary maintainer @silene
-
 ########## Test suite ##########
 
 /test-suite/Makefile    @gares