Index: head/gnu/usr.bin/binutils/Makefile
===================================================================
--- head/gnu/usr.bin/binutils/Makefile	(revision 116345)
+++ head/gnu/usr.bin/binutils/Makefile	(revision 116346)
@@ -1,18 +1,14 @@
 # $FreeBSD$
 
-#	In my absence, bde and jdp have pre-approval for any commit they feel
-#	necessary.
-MAINTAINER=	obrien@FreeBSD.org
-
 SUBDIR=		libiberty libbfd libopcodes libbinutils \
 		addr2line ar as gasp ld nm objcopy objdump ranlib readelf \
 		size strings strip doc
 
 TARGET_ARCH?=	${MACHINE_ARCH}
 .if (${TARGET_ARCH} == "alpha" \
   || ${TARGET_ARCH} == "i386" ) \
     && !defined(NO_GDB)
 SUBDIR+=	gdb gdbreplay
 .endif
 
 .include <bsd.subdir.mk>
Index: head/lib/libbz2/Makefile
===================================================================
--- head/lib/libbz2/Makefile	(revision 116345)
+++ head/lib/libbz2/Makefile	(revision 116346)
@@ -1,15 +1,13 @@
 # $FreeBSD$
 
-MAINTAINER=	obrien@FreeBSD.org
-
 BZ2DIR=	${.CURDIR}/../../contrib/bzip2
 .PATH: ${BZ2DIR}
 
 LIB=		bz2
 SHLIB_MAJOR=	1
 SRCS=		bzlib.c blocksort.c compress.c crctable.c decompress.c \
 		huffman.c randtable.c
 INCS=		bzlib.h
 CFLAGS+=	-I${BZ2DIR}
 
 .include <bsd.lib.mk>
Index: head/libexec/lukemftpd/Makefile
===================================================================
--- head/libexec/lukemftpd/Makefile	(revision 116345)
+++ head/libexec/lukemftpd/Makefile	(revision 116346)
@@ -1,47 +1,45 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/4/94
 # $FreeBSD$
 
-MAINTAINER=	obrien
-
 LUKEMFTPD=	${.CURDIR}/../../contrib/lukemftpd
 .PATH: ${LUKEMFTPD}/src ${LUKEMFTPD}/libnetbsd
 
 PROG=	lukemftpd
 MAN=	lukemftpd.8 ftpd.conf.5 ftpusers.5
 MLINKS=	ftpusers.5 ftpchroot.5
 SRCS=	cmds.c conf.c ftpd.c ftpcmd.y popen.c
 SRCS+=	strsuftoll.c
 
 WFORMAT= 0
 CFLAGS+= -include nbsd2fbsd.h
 CFLAGS+= -I${.CURDIR} -I${LUKEMFTPD} -I${LUKEMFTPD}/src
 CFLAGS+= -I${.CURDIR}/../..//lib/libc/stdtime
 YFLAGS=
 
 LDADD=	-lcrypt -lutil
 DPADD=	${LIBCRYPT} ${LIBUTIL}
 
 LSDIR=	../../bin/ls
 .PATH: ${.CURDIR}/${LSDIR}
 SRCS+=	ls-unmain.c cmp.c print.c util.c
 CFLAGS+=-I${.CURDIR}/${LSDIR}
 DPADD+=	${LIBM}
 LDADD+=	-lm
 
 CFLAGS+= -DUSE_OPIE -DUSE_PAM
 DPADD+=	${LIBOPIE} ${LIBPAM}
 LDADD+=	-lopie -lpam
 
 CLEANFILES+=	ls-unmain.c
 ls-unmain.c: ls.c
 	sed -e 's/^main(/ls_main(/g' -e 's,extern.h,${LSDIR}/extern.h,' \
 	    ${.ALLSRC} > ${.TARGET}
 
 ftpd.o ftpcmd.o: version.h
 
 lukemftpd.8: ftpd.8
 	ln -sf ${.ALLSRC} ${.TARGET}
 
 CLEANFILES+= lukemftpd.8
 
 .include <bsd.prog.mk>
Index: head/usr.bin/brandelf/Makefile
===================================================================
--- head/usr.bin/brandelf/Makefile	(revision 116345)
+++ head/usr.bin/brandelf/Makefile	(revision 116346)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-MAINTAINER=	obrien
-
 PROG=	brandelf
 
 .include <bsd.prog.mk>
Index: head/usr.bin/bzip2/Makefile
===================================================================
--- head/usr.bin/bzip2/Makefile	(revision 116345)
+++ head/usr.bin/bzip2/Makefile	(revision 116346)
@@ -1,56 +1,54 @@
 # $FreeBSD$
 
-MAINTAINER=	obrien@FreeBSD.org
-
 BZ2DIR=	${.CURDIR}/../../contrib/bzip2
 .PATH: ${BZ2DIR}
 
 PROG=	bzip2
 MAN=	bzip2.1
 CFLAGS+= -D_FILE_OFFSET_BITS=64
 
 SUBDIR+= doc
 
 DPADD=	${LIBBZ2}
 LDADD=	-lbz2
 
 NOSHARED?=	YES
 
 LINKS=	${BINDIR}/bzip2 ${BINDIR}/bunzip2
 LINKS+=	${BINDIR}/bzip2 ${BINDIR}/bzcat
 MLINKS= bzip2.1 bunzip2.1 bzip2.1 bzcat.1
 
 REFFILES=	sample1.ref sample2.ref sample3.ref 
 DREFFILES=	sample1.bz2 sample2.bz2 sample3.bz2 
 TESTFILES=	${REFFILES} ${DREFFILES}
 
 CLEANFILES+=	${TESTFILES} \
 		sample1.rb2 sample2.rb2 sample3.rb2 \
 		sample1.tst sample2.tst sample3.tst
 
 .for f in ${REFFILES}
 ${f}:	${f}.gz.uu
 	uudecode -p ${BZ2DIR}/${f}.gz.uu | gunzip > ${f}
 .endfor
 .for f in ${DREFFILES}
 ${f}:	${f}.uu
 	uudecode ${BZ2DIR}/${f}.uu
 .endfor
 
 test:  bzip2 ${TESTFILES}
 	@cat ${BZ2DIR}/words1
 	./bzip2 -1  < sample1.ref > sample1.rb2
 	./bzip2 -2  < sample2.ref > sample2.rb2
 	./bzip2 -3  < sample3.ref > sample3.rb2
 	./bzip2 -d  < sample1.bz2 > sample1.tst
 	./bzip2 -d  < sample2.bz2 > sample2.tst
 	./bzip2 -ds < sample3.bz2 > sample3.tst
 	cmp sample1.bz2 sample1.rb2 
 	cmp sample2.bz2 sample2.rb2
 	cmp sample3.bz2 sample3.rb2
 	cmp sample1.tst sample1.ref
 	cmp sample2.tst sample2.ref
 	cmp sample3.tst sample3.ref
 	@cat ${BZ2DIR}/words3
 
 .include <bsd.prog.mk>
Index: head/usr.bin/bzip2recover/Makefile
===================================================================
--- head/usr.bin/bzip2recover/Makefile	(revision 116345)
+++ head/usr.bin/bzip2recover/Makefile	(revision 116346)
@@ -1,11 +1,9 @@
 # $FreeBSD$
 
-MAINTAINER=	obrien@FreeBSD.org
-
 BZ2DIR=	${.CURDIR}/../../contrib/bzip2
 .PATH: ${BZ2DIR}
 
 PROG=	bzip2recover
 NOMAN=
 
 .include <bsd.prog.mk>