diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index d77f064ed55..2341577476d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,15 +7,26 @@
 # For documentation on this file, see https://help.github.com/articles/about-codeowners/
 # Mentioned users will get code review requests.
 
+# Boostraping and core infra
+pkgs/stdenv/	@Ericson2314
+pkgs/build-support/cc-wrapper/	@Ericson2314
+
+# Libraries
+lib/  @Profpatsch
+
+# Build-Support
+pkgs/build-support  @Profpatsch
+
 # Python-related code and docs
 pkgs/top-level/python-packages.nix	@FRidh
 pkgs/development/interpreters/python/*	@FRidh
 pkgs/development/python-modules/*	@FRidh
 doc/languages-frameworks/python.md	@FRidh
 
-# Boostraping and core infra
-pkgs/stdenv/	@Ericson2314
-pkgs/build-support/cc-wrapper/	@Ericson2314
+# Haskell
+pkgs/development/haskell-modules/default.nix  @Profpatsch
+pkgs/development/haskell-modules/generic-builder.nix  @Profpatsch
+pkgs/development/haskell-modules/hoogle.nix  @Profpatsch
 
 # Darwin-related
 pkgs/stdenv/darwin/*	@copumpkin @LnL7