diff --git a/MAINTAINERS b/MAINTAINERS
index 6020857d8c61..3acb06263471 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -18,6 +18,12 @@ However, this is not a 'big stick', it is an offer to help and a source
 of guidance.  It does not override the communal nature of the tree.
 It is not a registry of 'turf' or private property.
 
+***
+This list is prone to becoming stale quickly.  The best way to find the recent
+maintainer of a sub-system is to check recent logs for that directory or
+sub-system.
+***
+
 subsystem	login	notes
 -----------------------------
 kqueue		jmg	Pre-commit review requested.  Documentation Required.
@@ -80,6 +86,7 @@ file		obrien	Insists to keep file blocked from other's unapproved
 contrib/bzip2	obrien	Pre-commit review required.
 contrib/netbsd-tests	freebsd-testing,ngie	Pre-commit review requested.
 contrib/pjdfstest	freebsd-testing,ngie	Pre-commit review requested.
+geom		freebsd-geom@FreeBSD.org
 geom_concat	pjd	Pre-commit review preferred.
 geom_eli	pjd	Pre-commit review preferred.
 geom_gate	pjd	Pre-commit review preferred.
@@ -91,7 +98,7 @@ geom_shsec	pjd	Pre-commit review preferred.
 geom_stripe	pjd	Pre-commit review preferred.
 geom_zero	pjd	Pre-commit review preferred.
 sbin/geom	pjd	Pre-commit review preferred.
-zfs		pjd	Pre-commit review preferred.
+zfs		freebsd-fs@FreeBSD.org
 nfs		alfred	Will be happy to review code, but not mandatory.
 rpc.lockd	alfred	Will be happy to review code, but not mandatory.
 truss		alfred	Will be happy to review code, but not mandatory.