diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4bd600ad447..49a625e579e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -40,6 +40,7 @@
 /contrib/llvm-project/libunwind @DimitryAndric @emaste @bsdjhb
 /contrib/llvm-project/lldb @DimitryAndric @emaste
 /contrib/llvm-project/openmp @DimitryAndric @emaste
+/contrib/mandoc		@concussious
 /contrib/netbsd-tests	@ngie-eign
 /contrib/netbsd-tests/crypto/opencrypto/	@jmgurney
 /contrib/netbsd-tests/kernel/kqueue/	@jmgurney
@@ -65,6 +66,7 @@
 /sbin/nvmecontrol @bsdimp
 /sbin/veriexec/	@stephane-rochoy-stormshield
 /secure/usr.bin/openssl/	@juikim
+/share/man/		@concussious
 /share/mk	@bsdimp @bapt @bdrewery @emaste
 /stand		@bsdimp
 /stand/lua	@kevans91
diff --git a/MAINTAINERS b/MAINTAINERS
index fd3d4c40d50..80c4bf5ce90 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -48,6 +48,7 @@ contrib/llvm-project/lldb	dim,emaste	Pre-commit review preferred.
 contrib/llvm-project/llvm	dim		Pre-commit review preferred.
 contrib/llvm-project/openmp	dim,emaste	Pre-commit review preferred.
 contrib/netbsd-tests	ngie,#test		Pre-commit review requested.
+contrib/mandoc		ziaee			Pre-commit review please
 contrib/pjdfstest	asomers,ngie,pjd,#test	Pre-commit review requested.
 *env(3)		secteam	Due to the problematic security history of this
 			code, please have patches reviewed by secteam.
@@ -93,6 +94,7 @@ sendmail	gshapiro	Pre-commit review requested.
 sh(1)		jilles		Pre-commit review requested. This also applies
 				to kill(1), printf(1) and test(1) which are
 				compiled in as builtins.
+share/man		ziaee	Pre-commit review please
 share/mk	imp, bapt, bdrewery, emaste, sjg	Make is hard.
 share/mk/*.test.mk	imp,bapt,bdrewery,	Pre-commit review requested.
 			emaste,ngie,sjg,#test