diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 441774e1244..0d9aed6b5f3 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -35,7 +35,7 @@
 /contrib/atf		@ngie-eign
 /contrib/capsicum-test	@ngie-eign
 /contrib/googletest	@ngie-eign
-/contrib/ipfilter	@cschuber
+/sbin/ipf		@cschuber
 /contrib/libcxxrt	@DimitryAndric @emaste
 /contrib/llvm-project	@DimitryAndric
 /contrib/llvm-project/libunwind @DimitryAndric @emaste @bsdjhb
@@ -69,7 +69,7 @@
 /sys/arm64/rockchip	@evadot
 /sys/compat/linprocfs/	@dag-erling
 /sys/compat/linuxkpi	@hselasky
-/sys/contrib/ipfilter	@cschuber
+/sys/netpfil/ipfilter	@cschuber
 /sys/crypto/openssl/	@juikim
 /sys/dev/drm2	@bsdimp
 /sys/dev/iscsi/	@trasz
diff --git a/MAINTAINERS b/MAINTAINERS
index 4bcc352b1fc..936c6ada953 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -40,7 +40,7 @@ ath(4)		adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
 contrib/atf		ngie,#test		Pre-commit review requested.
 contrib/capsicum-test	ngie,#capsicum,#test	Pre-commit review requested.
 contrib/googletest	ngie,#test		Pre-commit review requested.
-contrib/ipfilter	cy			Pre-commit review requested.
+sbin/ipf	cy			Pre-commit review requested.
 contrib/libcxxrt	dim,emaste		Pre-commit review preferred.
 contrib/llvm-project/compiler-rt	dim	Pre-commit review preferred.
 contrib/llvm-project/libcxx	dim		Pre-commit review preferred.
@@ -103,7 +103,7 @@ sys/compat/linuxkpi	hselasky		If in doubt, ask.
 						(to avoid drm graphics drivers
 						impact)
 sys/contrib/dev/ice	erj	Pre-commit phabricator review requested.
-sys/contrib/ipfilter	cy	Pre-commit review requested.
+sys/netpfil/ipfilter	cy	Pre-commit review requested.
 sys/dev/e1000	erj	Pre-commit phabricator review requested.
 sys/dev/ixgbe	erj	Pre-commit phabricator review requested.
 sys/dev/ixl	erj	Pre-commit phabricator review requested.