diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index c101a94c889..09ff2454eef 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -2,6 +2,14 @@
 # Each line is a file pattern followed by one or more owners.
 # Owners can be @users, @org/teams or emails
 
+# Buildsystem
+
+.*                                  @godotengine/buildsystem
+.github/                            @godotengine/buildsystem
+*.py                                @godotengine/buildsystem
+SConstruct                          @godotengine/buildsystem
+SCsub                               @godotengine/buildsystem
+
 # Core
 
 /core/                              @godotengine/core
@@ -35,6 +43,9 @@ doc_classes/*                       @godotengine/documentation
 /drivers/unix/                      @godotengine/_platforms
 /drivers/windows/                   @godotengine/windows
 
+## Misc
+/drivers/png/                       @godotengine/import
+
 # Editor
 
 /editor/*debugger*                  @godotengine/debugger
@@ -129,9 +140,9 @@ doc_classes/*                       @godotengine/documentation
 # Platform
 
 /platform/android/                  @godotengine/android
-/platform/iphone/                   @godotengine/iphone
+/platform/iphone/                   @godotengine/ios
 /platform/javascript/               @godotengine/html5
-/platform/linuxbsd/                 @godotengine/linuxbsd
+/platform/linuxbsd/                 @godotengine/linux-bsd
 /platform/osx/                      @godotengine/macos
 /platform/uwp/                      @godotengine/uwp
 /platform/windows/                  @godotengine/windows
@@ -145,9 +156,11 @@ doc_classes/*                       @godotengine/documentation
 /scene/debugger/                    @godotengine/debugger
 /scene/gui/                         @godotengine/gui-nodes
 /scene/main/                        @godotengine/core
+/scene/resources/default_theme/     @godotengine/gui-nodes
 /scene/resources/font.*             @godotengine/gui-nodes
 /scene/resources/text_line.*        @godotengine/gui-nodes
 /scene/resources/text_paragraph.*   @godotengine/gui-nodes
+/scene/resources/visual_shader*.*   @godotengine/shaders
 
 # Servers