Index: head/share/doc/bind9/Makefile
===================================================================
--- head/share/doc/bind9/Makefile	(revision 186463)
+++ head/share/doc/bind9/Makefile	(revision 186464)
@@ -1,26 +1,26 @@
 # $FreeBSD$
 
 BIND_DIR=	${.CURDIR}/../../../contrib/bind9
 SRCDIR=		${BIND_DIR}/doc
 
 .PATH: ${BIND_DIR} ${SRCDIR}/arm ${SRCDIR}/misc
 
 NO_OBJ=
 
 FILESGROUPS=	TOP ARM MISC
 TOP=		CHANGES COPYRIGHT FAQ README README.idnkit
 TOPDIR=		${DOCDIR}/bind9
 ARM=		Bv9ARM.ch01.html Bv9ARM.ch02.html Bv9ARM.ch03.html \
 		Bv9ARM.ch04.html Bv9ARM.ch05.html Bv9ARM.ch06.html \
 		Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html \
 		Bv9ARM.ch10.html Bv9ARM.html man.dig.html \
 		man.dnssec-keygen.html man.dnssec-signzone.html man.host.html \
 		man.named-checkconf.html man.named-checkzone.html \
 		man.named.html man.rndc-confgen.html man.rndc.conf.html \
 		man.rndc.html
 ARMDIR=		${TOPDIR}/arm
 MISC=		dnssec format-options.pl ipv6 migration migration-4to9 \
-		options rfc-compliance roadmap sdb
+		options rfc-compliance roadmap sdb sort-options.pl
 MISCDIR=	${TOPDIR}/misc
 
 .include <bsd.prog.mk>
Index: head/usr.bin/nsupdate/Makefile
===================================================================
--- head/usr.bin/nsupdate/Makefile	(revision 186463)
+++ head/usr.bin/nsupdate/Makefile	(revision 186464)
@@ -1,26 +1,26 @@
 # $FreeBSD$
 
 BIND_DIR=	${.CURDIR}/../../contrib/bind9
 LIB_BIND_REL=	../../lib/bind
 LIB_BIND_DIR=	${.CURDIR}/${LIB_BIND_REL}
 SRCDIR=		${BIND_DIR}/bin/nsupdate
 
 .include	"${LIB_BIND_DIR}/config.mk"
 
 PROG=		nsupdate
 
 .PATH: ${SRCDIR}
 SRCS+=		nsupdate.c
 
 CFLAGS+=	-I${SRCDIR}/include
 CFLAGS+=	-I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include
 
 DPADD+=		${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD}
 LDADD+=		${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD}
 
-MAN=		nsupdate.8
+MAN=		nsupdate.1
 
 MANFILTER=	sed -e "s@/etc/named\.conf@/etc/namedb/named.conf@g" \
 		-e "s@^\.HP [0-9]* @@"
 
 .include <bsd.prog.mk>