diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8cdb55e3b58a..de6f0c72f471 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -82,11 +82,13 @@ vmm/	@bsdjhb @grehan-freebsd
 /sys/dev/sound/usb	@hselasky
 /sys/dev/usb	@hselasky
 /sys/fs/fuse/	@asomers
+/sys/kern/vfs_aio.c	@asomers
 /sys/netinet/ip_carp.c	@glebius
 /sys/netinet/sctp_*	@tuexen
 /sys/netpfil/pf	@kprovost @glebius
 /sys/x86/pci	@bsdimp @bsdjhb
 /tests	@ngie
+/tests/sys/aio/	@asomers
 /tests/sys/fs/fusefs/ @asomers
 /tools/build	@bsdimp
 /tools/tools/nanobsd	@bsdimp
diff --git a/MAINTAINERS b/MAINTAINERS
index 09ee157eb128..caa19f1b1d25 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -35,6 +35,7 @@ makes a commit to the specified subtree.
 
 subsystem	login	notes
 -----------------------------
+aio(4)		asomers	Pre-commit review requested.
 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.