diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2df505627dc..7d97938a224 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -51,7 +51,7 @@
 /crypto/heimdal		@cschuber
 /crypto/krb5		@cschuber
 /crypto/openssh	@dag-erling @emaste
-/crypto/openssl/	@juikim
+/crypto/openssl/	@ngie-eign
 /etc/mail	@gshapiro
 /etc/sendmail	@gshapiro
 /kerberos5	@cschuber
@@ -76,7 +76,8 @@
 /sbin/mount_fusefs @asomers
 /sbin/nvmecontrol @bsdimp
 /sbin/veriexec/	@stephane-rochoy-stormshield
-/secure/usr.bin/openssl/	@juikim
+/secure/lib/libcrypto/	@ngie-eign
+/secure/lib/libssl/	@ngie-eign
 /share/man/		@concussious
 /share/mk	@bsdimp @bapt @bdrewery @brooksdavis @emaste
 /stand		@bsdimp
@@ -90,7 +91,7 @@
 /sys/arm64/rockchip	@evadot
 /sys/arm64/vmm		@zxombie
 /sys/compat/linprocfs/	@dag-erling
-/sys/crypto/openssl/	@juikim
+/sys/crypto/openssl/	@ngie-eign
 /sys/dev/drm2	@bsdimp
 /sys/dev/ftgpio/	@stephane-rochoy-stormshield
 /sys/dev/ftwd/	@stephane-rochoy-stormshield
diff --git a/MAINTAINERS b/MAINTAINERS
index 7878004cf3f..4f4d15869c8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -77,8 +77,8 @@ nvme(4)		imp	Pre-commit review requested.
 nvmecontrol(8)	imp	Pre-commit review requested.
 opencrypto	jhb	Pre-commit review requested.
 openpam		des	Pre-commit review required.
+openssl		ngie	Pre-commit review requested.
 openssh		emaste	Pre-commit review requested.
-openssl		benl	Pre-commit review requested.
 otus(4)		adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
 sys/dev/pci	imp,jhb	Pre-commit review requested.
 pmcstudy(8)	rrs		Pre-commit review requested.