diff --git a/MAINTAINERS b/MAINTAINERS
index 239f39c81350..7c7bbaecc897 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -137,28 +137,16 @@ $ cd /usr/src; find */* -type f|xargs egrep 'MAINTAINER[ <tab>]*='
 bin/dd/Makefile:MAINTAINER=	green@FreeBSD.org
 games/fortune/datfiles/Makefile:MAINTAINER=	jkh
 gnu/usr.bin/man/apropos/Makefile:MAINTAINER= wosch
-lib/libusbhid/Makefile:MAINTAINER=	n_hibma@FreeBSD.ORG
 sbin/dhclient/Makefile.inc:MAINTAINER=     mbr
 sys/compat/svr4/Makefile:MAINTAINER=	newton@freebsd.org
 sys/dev/asr/MAINTAINER:MAINTAINER = obrien@freebsd, scott_long@btc.adaptec.com, mark_salyzyn@adaptec.com
 sys/dev/bktr/CHANGELOG.TXT: * MAINTAINER = Roger Hardiman <roger@freebsd.org>
 sys/modules/3dfx/Makefile:MAINTAINER=	cokane@FreeBSD.org
 sys/modules/bktr/bktr_mem/Makefile:MAINTAINER=	roger@freebsd.org
-sys/modules/cam/Makefile:MAINTAINER=	n_hibma@freebsd.org
 sys/modules/linux/Makefile:MAINTAINER=	emulation@FreeBSD.org
 sys/modules/streams/Makefile:MAINTAINER=	newton@atdot.dotat.org
 sys/modules/svr4/Makefile:MAINTAINER=	newton@FreeBSD.org
-sys/modules/udbp/Makefile:MAINTAINER=	n_hibma@freebsd.org
-sys/modules/ugen/Makefile:MAINTAINER=	n_hibma@freebsd.org
-sys/modules/uhid/Makefile:MAINTAINER=	n_hibma@freebsd.org
-sys/modules/ukbd/Makefile:MAINTAINER=	n_hibma@freebsd.org
-sys/modules/ulpt/Makefile:MAINTAINER=	n_hibma@freebsd.org
-sys/modules/umass/Makefile:MAINTAINER=	n_hibma@freebsd.org
-sys/modules/umodem/Makefile:MAINTAINER=	n_hibma@freebsd.org
-sys/modules/ums/Makefile:MAINTAINER=	n_hibma@freebsd.org
 sys/modules/urio/Makefile:MAINTAINER=	Iwasa Kazmi <kzmi@ca2.so-net.ne.jp>
-sys/modules/usb/Makefile:MAINTAINER=	n_hibma@freebsd.org
-sys/modules/uscanner/Makefile:MAINTAINER=	n_hibma@freebsd.org
 tools/tools/sysdoc/Makefile:MAINTAINER=	trhodes@FreeBSD.org
 usr.bin/locate/Makefile:MAINTAINER= wosch
 usr.sbin/zic/Makefile:MAINTAINER=	wollman@FreeBSD.org
diff --git a/lib/libusbhid/Makefile b/lib/libusbhid/Makefile
index 9594649b88d2..208d32d2561a 100644
--- a/lib/libusbhid/Makefile
+++ b/lib/libusbhid/Makefile
@@ -1,8 +1,6 @@
 #	$NetBSD: Makefile,v 1.5 1999/07/23 09:44:38 mrg Exp $
 #	$FreeBSD$
 
-MAINTAINER=	n_hibma@FreeBSD.ORG
-
 LIB=	usbhid
 MAN=	usbhid.3
 
diff --git a/sys/modules/cam/Makefile b/sys/modules/cam/Makefile
index 10e942d52281..d175dbf8141b 100644
--- a/sys/modules/cam/Makefile
+++ b/sys/modules/cam/Makefile
@@ -1,6 +1,5 @@
-# $FreeBSD$ 
+# $FreeBSD$
 
-MAINTAINER=	n_hibma@freebsd.org
 S=	${.CURDIR}/../..
 
 .PATH: $S/cam $S/cam/scsi
diff --git a/sys/modules/udbp/Makefile b/sys/modules/udbp/Makefile
index 2092523d30a4..aeeac7cb4b98 100644
--- a/sys/modules/udbp/Makefile
+++ b/sys/modules/udbp/Makefile
@@ -1,6 +1,4 @@
-# $FreeBSD$ 
-
-MAINTAINER=	n_hibma@freebsd.org
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/ugen/Makefile b/sys/modules/ugen/Makefile
index 22c833459f22..d024a3a396d3 100644
--- a/sys/modules/ugen/Makefile
+++ b/sys/modules/ugen/Makefile
@@ -1,6 +1,4 @@
-# $FreeBSD$ 
-
-MAINTAINER=	n_hibma@freebsd.org
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/uhid/Makefile b/sys/modules/uhid/Makefile
index d5ab0131fe10..31c5a17ec2b8 100644
--- a/sys/modules/uhid/Makefile
+++ b/sys/modules/uhid/Makefile
@@ -1,6 +1,4 @@
-# $FreeBSD$ 
-
-MAINTAINER=	n_hibma@freebsd.org
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/ukbd/Makefile b/sys/modules/ukbd/Makefile
index cd2e02e264db..3c55896e6088 100644
--- a/sys/modules/ukbd/Makefile
+++ b/sys/modules/ukbd/Makefile
@@ -1,6 +1,4 @@
-# $FreeBSD$ 
-
-MAINTAINER=	n_hibma@freebsd.org
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/ulpt/Makefile b/sys/modules/ulpt/Makefile
index 46becf8c4023..c7d51c30f9fa 100644
--- a/sys/modules/ulpt/Makefile
+++ b/sys/modules/ulpt/Makefile
@@ -1,6 +1,4 @@
-# $FreeBSD$ 
-
-MAINTAINER=	n_hibma@freebsd.org
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/umass/Makefile b/sys/modules/umass/Makefile
index b0412ff920fe..4af29fe90976 100644
--- a/sys/modules/umass/Makefile
+++ b/sys/modules/umass/Makefile
@@ -1,6 +1,4 @@
-# $FreeBSD$ 
-
-MAINTAINER=	n_hibma@freebsd.org
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/umodem/Makefile b/sys/modules/umodem/Makefile
index 7258d4f5e386..458a2c3cfafb 100644
--- a/sys/modules/umodem/Makefile
+++ b/sys/modules/umodem/Makefile
@@ -1,6 +1,4 @@
-# $FreeBSD$ 
-
-MAINTAINER=	n_hibma@freebsd.org
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/ums/Makefile b/sys/modules/ums/Makefile
index 351f08142dd5..fee38430c2ec 100644
--- a/sys/modules/ums/Makefile
+++ b/sys/modules/ums/Makefile
@@ -1,6 +1,4 @@
-# $FreeBSD$ 
-
-MAINTAINER=	n_hibma@freebsd.org
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../../dev/usb
 
diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile
index 72347e6431dd..d08279d89376 100644
--- a/sys/modules/usb/Makefile
+++ b/sys/modules/usb/Makefile
@@ -1,6 +1,4 @@
-# $FreeBSD$ 
-
-MAINTAINER=	n_hibma@freebsd.org
+# $FreeBSD$
 
 S=	${.CURDIR}/../..
 
diff --git a/sys/modules/uscanner/Makefile b/sys/modules/uscanner/Makefile
index 995fc71726a7..fa3485659339 100644
--- a/sys/modules/uscanner/Makefile
+++ b/sys/modules/uscanner/Makefile
@@ -1,6 +1,4 @@
-# $FreeBSD$ 
-
-MAINTAINER=	n_hibma@freebsd.org
+# $FreeBSD$
 
 .PATH: ${.CURDIR}/../../dev/usb