diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index ad6262c3380..d602cd25ad8 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -48,10 +48,14 @@
 /contrib/one-true-awk/		@bsdimp
 /contrib/openpam/lib/libpam/		@dag-erling
 /contrib/pjdfstest	@ngie-eign @asomers
+/crypto/heimdal		@cschuber
+/crypto/krb5		@cschuber
 /crypto/openssh	@dag-erling @emaste
 /crypto/openssl/	@juikim
 /etc/mail	@gshapiro
 /etc/sendmail	@gshapiro
+/kerberos5	@cschuber
+/krb5		@cschuber
 /lib/libblocklist	@jlduran
 /lib/libc/string/	@fuz
 /lib/libc/*/string/	@fuz