diff --git a/CODEOWNERS b/CODEOWNERS
index 42918f71c4..3036e8b3a1 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -10,7 +10,13 @@
 # CPUKit
 ########
 
-[CPUKit libdrvmgr] @joel
+[CPUKit libdebugger] @approvers/cpukit/libdebugger
+/cpukit/libdebugger
+
+[CPUKit libdl] @approvers/cpukit/libdl
+/cpukit/libdl
+
+[CPUKit libdrvmgr] @approvers/cpukit/libdrvmgr
 /cpukit/libdrvmgr
 
 [CPUKit libgnat] @joel
@@ -23,6 +29,7 @@
 /cpukit/libstdthreads
 
 
+
 # Architectures
 ###############