diff --git a/MAINTAINERS b/MAINTAINERS
index ecf5c1d5ae4..91d9eac106c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -120,16 +120,7 @@ lib/libc/stdtime	edwin   Heads-up appreciated, since parts of this code
 				is maintained by a third party source.
 sbin/routed	bms	Pre-commit review; notify vendor at rhyolite.com
 isci(4)		jimharris	Pre-commit review requested.
-
-Following are the entries from the Makefiles, and a few other sources.
-Please remove stale entries from both their origin, and this file.
-
-Please also consider removing the lines from the files listed below and
-stating your preferences here instead.
-
-List below generated with:
-$ cd /usr/src; find */* -type f|xargs egrep 'MAINTAINER[ <tab>]*='
-
-sys/modules/3dfx/Makefile:MAINTAINER=	cokane@FreeBSD.org
-sys/modules/urio/Makefile:MAINTAINER=	Iwasa Kazmi <kzmi@ca2.so-net.ne.jp>
-tools/tools/sysdoc/Makefile:MAINTAINER=	trhodes@FreeBSD.org
+3dfx		cokane		Pre-commit review preferred.
+cmx		daniel@roe.ch	Pre-commit review preferred.
+fileman		obrien		Pre-commit review preferred.
+sysdoc		trhodes		Pre-commit review preferred.
diff --git a/sys/modules/3dfx/Makefile b/sys/modules/3dfx/Makefile
index ac7730b276e..67f18315064 100644
--- a/sys/modules/3dfx/Makefile
+++ b/sys/modules/3dfx/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-MAINTAINER=	cokane@FreeBSD.org
-
 .PATH: $(.CURDIR)/../../dev/tdfx
 
 KMOD=	3dfx
diff --git a/sys/modules/cmx/Makefile b/sys/modules/cmx/Makefile
index 9da17b20bfa..779a8301d5b 100644
--- a/sys/modules/cmx/Makefile
+++ b/sys/modules/cmx/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 #
-MAINTAINER=	daniel@roe.ch
-
 .PATH:	${.CURDIR}/../../dev/cmx
 
 KMOD=	cmx
diff --git a/sys/modules/filemon/Makefile b/sys/modules/filemon/Makefile
index 3bb5351c777..e6df2bc90da 100644
--- a/sys/modules/filemon/Makefile
+++ b/sys/modules/filemon/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-MAINTAINER=	obrien@FreeBSD.org
-
 .PATH: ${.CURDIR}/../../dev/filemon
 
 KMOD=	filemon
diff --git a/tools/tools/sysdoc/Makefile b/tools/tools/sysdoc/Makefile
index f3704dab9eb..724d62cf2f3 100644
--- a/tools/tools/sysdoc/Makefile
+++ b/tools/tools/sysdoc/Makefile
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-MAINTAINER=	trhodes@FreeBSD.org
-
 sysctl.5:
 	sh ${.CURDIR}/sysdoc.sh -k /boot/kernel