diff --git a/CODEOWNERS b/CODEOWNERS
index 48ce3ea4a..10fddaf01 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -4,3 +4,5 @@
 /mesonbuild/modules/unstable_external_project.py @xclaesse
 /mesonbuild/ast/* @mensinda
 /mesonbuild/cmake/* @mensinda
+/mesonbuild/compilers/* @dcbaker
+/mesonbuild/linkers.py @dcbaker