--- a/components/bind/Solaris/dns-server.8s	Mon Feb 27 11:27:07 2017 -0800
+++ b/components/bind/Solaris/dns-server.8s	Thu Feb 16 12:50:39 2017 +0000
@@ -1,6 +1,6 @@
 '\" te
 .\" Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
-.TH dns-server 5 "18 Apr 2016" "SunOS 5.12" "Standards, Environments, and Macros"
+.TH dns-server 8s "18 Apr 2016" "SunOS 5.12" "Standards, Environments, and Macros"
 .SH NAME
 dns-server \- Domain Name Server service
 .SH DESCRIPTION
@@ -424,7 +424,7 @@
 .SH ATTRIBUTES
 .sp
 .LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
+See \fBattributes\fR(7) for descriptions of the following attributes:
 .sp
 
 .sp

--- a/components/bind/bind.p5m	Mon Feb 27 11:27:07 2017 -0800
+++ b/components/bind/bind.p5m	Thu Feb 16 12:50:39 2017 +0000
@@ -18,14 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
-<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
-
-# HTML documents are obtained directly from source.
-<transform file path=usr/share/doc/bind/html/(.+)$ -> \
-    set action.hash doc/arm/%<1> >
 set name=pkg.fmri \
     value=pkg:/service/network/dns/bind@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="BIND DNS name server and configuration tools."
@@ -78,82 +73,6 @@
 file path=usr/sbin/pkcs11-tokens
 file path=usr/sbin/rndc-confgen
 link path=usr/sbin/tsig-keygen target=ddns-confgen
-
-# Standard Documentation
-file doc/arm/Bv9ARM.pdf path=usr/share/doc/bind/Bv9ARM.pdf
-file path=usr/share/doc/bind/html/Bv9ARM.ch01.html
-file path=usr/share/doc/bind/html/Bv9ARM.ch02.html
-file path=usr/share/doc/bind/html/Bv9ARM.ch03.html
-file path=usr/share/doc/bind/html/Bv9ARM.ch04.html
-file path=usr/share/doc/bind/html/Bv9ARM.ch05.html
-file path=usr/share/doc/bind/html/Bv9ARM.ch06.html
-file path=usr/share/doc/bind/html/Bv9ARM.ch07.html
-file path=usr/share/doc/bind/html/Bv9ARM.ch08.html
-file path=usr/share/doc/bind/html/Bv9ARM.ch09.html
-file path=usr/share/doc/bind/html/Bv9ARM.ch10.html
-file path=usr/share/doc/bind/html/Bv9ARM.ch11.html
-file path=usr/share/doc/bind/html/Bv9ARM.ch12.html
-file path=usr/share/doc/bind/html/Bv9ARM.ch13.html
-file path=usr/share/doc/bind/html/Bv9ARM.html
-file path=usr/share/doc/bind/html/man.arpaname.html
-file path=usr/share/doc/bind/html/man.ddns-confgen.html
-file path=usr/share/doc/bind/html/man.delv.html
-file path=usr/share/doc/bind/html/man.dig.html
-file path=usr/share/doc/bind/html/man.dnssec-checkds.html
-file path=usr/share/doc/bind/html/man.dnssec-coverage.html
-file path=usr/share/doc/bind/html/man.dnssec-dsfromkey.html
-file path=usr/share/doc/bind/html/man.dnssec-importkey.html
-file path=usr/share/doc/bind/html/man.dnssec-keyfromlabel.html
-file path=usr/share/doc/bind/html/man.dnssec-keygen.html
-file path=usr/share/doc/bind/html/man.dnssec-revoke.html
-file path=usr/share/doc/bind/html/man.dnssec-settime.html
-file path=usr/share/doc/bind/html/man.dnssec-signzone.html
-file path=usr/share/doc/bind/html/man.dnssec-verify.html
-file path=usr/share/doc/bind/html/man.genrandom.html
-file path=usr/share/doc/bind/html/man.host.html
-file path=usr/share/doc/bind/html/man.isc-hmac-fixup.html
-file path=usr/share/doc/bind/html/man.named-checkconf.html
-file path=usr/share/doc/bind/html/man.named-checkzone.html
-file path=usr/share/doc/bind/html/man.named-journalprint.html
-file path=usr/share/doc/bind/html/man.named-rrchecker.html
-file path=usr/share/doc/bind/html/man.named.conf.html
-file path=usr/share/doc/bind/html/man.named.html
-file path=usr/share/doc/bind/html/man.nsec3hash.html
-file path=usr/share/doc/bind/html/man.nsupdate.html
-file path=usr/share/doc/bind/html/man.rndc-confgen.html
-file path=usr/share/doc/bind/html/man.rndc.conf.html
-file path=usr/share/doc/bind/html/man.rndc.html
-file path=usr/share/doc/bind/html/notes.html
-file doc/arm/notes.pdf path=usr/share/doc/bind/notes.pdf
-file path=usr/share/man/man1/named-rrchecker.1
-file path=usr/share/man/man5/named.conf.5
-file path=usr/share/man/man8/ddns-confgen.8
-file path=usr/share/man/man8/dnssec-checkds.8
-file path=usr/share/man/man8/dnssec-coverage.8
-file path=usr/share/man/man8/dnssec-dsfromkey.8
-file path=usr/share/man/man8/dnssec-importkey.8
-file path=usr/share/man/man8/dnssec-keyfromlabel.8
-file path=usr/share/man/man8/dnssec-keygen.8
-file path=usr/share/man/man8/dnssec-revoke.8
-file path=usr/share/man/man8/dnssec-settime.8
-file path=usr/share/man/man8/dnssec-signzone.8
-file path=usr/share/man/man8/dnssec-verify.8
-file path=usr/share/man/man8/genrandom.8
-file path=usr/share/man/man8/isc-hmac-fixup.8
-file path=usr/share/man/man8/named-checkconf.8
-link path=usr/share/man/man8/named-checkzone.8 target=named-compilezone.8
-file path=usr/share/man/man8/named-compilezone.8
-file path=usr/share/man/man8/named-journalprint.8
-file path=usr/share/man/man8/named.8
-file path=usr/share/man/man8/nsec3hash.8
-file path=usr/share/man/man8/pkcs11-destroy.8
-file path=usr/share/man/man8/pkcs11-keygen.8
-file path=usr/share/man/man8/pkcs11-list.8
-file path=usr/share/man/man8/pkcs11-tokens.8
-file path=usr/share/man/man8/rndc-confgen.8
-link path=usr/share/man/man8/tsig-keygen.8 target=ddns-confgen.8
-file Solaris/dns-server.8s path=usr/share/man/man8s/dns-server.8s \
-    mangler.bypass=true
 legacy pkg=SUNWbind desc="BIND DNS Name server" name="BIND DNS Name server"
 legacy pkg=SUNWbindr desc="BIND Name server Manifest" \
     name="BIND Name server Manifest"

--- a/components/bind/bindc.p5m	Mon Feb 27 11:27:07 2017 -0800
+++ b/components/bind/bindc.p5m	Thu Feb 16 12:50:39 2017 +0000
@@ -22,10 +22,14 @@
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
+
+# HTML documents are obtained directly from source.
+<transform file path=usr/share/doc/bind/html/(.+)$ -> \
+    set action.hash doc/arm/%<1> >
 set name=pkg.fmri \
     value=pkg:/network/dns/bind@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="BIND DNS tools"
-set name=pkg.description value="DNS tools and related libraries."
+set name=pkg.description value="DNS tools, related libraries and documentation."
 set name=pkg.human-version value=$(HUMAN_VERSION)
 
 # This package name has known conflicts with other packages in the WOS
@@ -70,11 +74,88 @@
 link path=usr/sbin/nslookup target=../bin/nslookup
 link path=usr/sbin/nsupdate target=../bin/nsupdate
 file path=usr/sbin/rndc
+file doc/arm/Bv9ARM.pdf path=usr/share/doc/bind/Bv9ARM.pdf
+file path=usr/share/doc/bind/html/Bv9ARM.ch01.html
+file path=usr/share/doc/bind/html/Bv9ARM.ch02.html
+file path=usr/share/doc/bind/html/Bv9ARM.ch03.html
+file path=usr/share/doc/bind/html/Bv9ARM.ch04.html
+file path=usr/share/doc/bind/html/Bv9ARM.ch05.html
+file path=usr/share/doc/bind/html/Bv9ARM.ch06.html
+file path=usr/share/doc/bind/html/Bv9ARM.ch07.html
+file path=usr/share/doc/bind/html/Bv9ARM.ch08.html
+file path=usr/share/doc/bind/html/Bv9ARM.ch09.html
+file path=usr/share/doc/bind/html/Bv9ARM.ch10.html
+file path=usr/share/doc/bind/html/Bv9ARM.ch11.html
+file path=usr/share/doc/bind/html/Bv9ARM.ch12.html
+file path=usr/share/doc/bind/html/Bv9ARM.ch13.html
+file path=usr/share/doc/bind/html/Bv9ARM.html
+file path=usr/share/doc/bind/html/man.arpaname.html
+file path=usr/share/doc/bind/html/man.ddns-confgen.html
+file path=usr/share/doc/bind/html/man.delv.html
+file path=usr/share/doc/bind/html/man.dig.html
+file path=usr/share/doc/bind/html/man.dnssec-checkds.html
+file path=usr/share/doc/bind/html/man.dnssec-coverage.html
+file path=usr/share/doc/bind/html/man.dnssec-dsfromkey.html
+file path=usr/share/doc/bind/html/man.dnssec-importkey.html
+file path=usr/share/doc/bind/html/man.dnssec-keyfromlabel.html
+file path=usr/share/doc/bind/html/man.dnssec-keygen.html
+file path=usr/share/doc/bind/html/man.dnssec-revoke.html
+file path=usr/share/doc/bind/html/man.dnssec-settime.html
+file path=usr/share/doc/bind/html/man.dnssec-signzone.html
+file path=usr/share/doc/bind/html/man.dnssec-verify.html
+file path=usr/share/doc/bind/html/man.genrandom.html
+file path=usr/share/doc/bind/html/man.host.html
+file path=usr/share/doc/bind/html/man.isc-hmac-fixup.html
+file path=usr/share/doc/bind/html/man.named-checkconf.html
+file path=usr/share/doc/bind/html/man.named-checkzone.html
+file path=usr/share/doc/bind/html/man.named-journalprint.html
+file path=usr/share/doc/bind/html/man.named-rrchecker.html
+file path=usr/share/doc/bind/html/man.named.conf.html
+file path=usr/share/doc/bind/html/man.named.html
+file path=usr/share/doc/bind/html/man.nsec3hash.html
+file path=usr/share/doc/bind/html/man.nsupdate.html
+file path=usr/share/doc/bind/html/man.rndc-confgen.html
+file path=usr/share/doc/bind/html/man.rndc.conf.html
+file path=usr/share/doc/bind/html/man.rndc.html
+file path=usr/share/doc/bind/html/notes.html
+file doc/arm/notes.pdf path=usr/share/doc/bind/notes.pdf
+
+# Standard Documentation
 file path=usr/share/man/man1/arpaname.1
 file path=usr/share/man/man1/delv.1
 file path=usr/share/man/man1/dig.1
 file path=usr/share/man/man1/host.1
+file path=usr/share/man/man1/named-rrchecker.1
 file path=usr/share/man/man1/nslookup.1
 file path=usr/share/man/man1/nsupdate.1
+file path=usr/share/man/man5/named.conf.5
+file path=usr/share/man/man5/rndc.conf.5
+file path=usr/share/man/man8/ddns-confgen.8
+file path=usr/share/man/man8/dnssec-checkds.8
+file path=usr/share/man/man8/dnssec-coverage.8
+file path=usr/share/man/man8/dnssec-dsfromkey.8
+file path=usr/share/man/man8/dnssec-importkey.8
+file path=usr/share/man/man8/dnssec-keyfromlabel.8
+file path=usr/share/man/man8/dnssec-keygen.8
+file path=usr/share/man/man8/dnssec-revoke.8
+file path=usr/share/man/man8/dnssec-settime.8
+file path=usr/share/man/man8/dnssec-signzone.8
+file path=usr/share/man/man8/dnssec-verify.8
+file path=usr/share/man/man8/genrandom.8
+file path=usr/share/man/man8/isc-hmac-fixup.8
+file path=usr/share/man/man8/named-checkconf.8
+link path=usr/share/man/man8/named-checkzone.8 target=named-compilezone.8
+file path=usr/share/man/man8/named-compilezone.8
+file path=usr/share/man/man8/named-journalprint.8
+file path=usr/share/man/man8/named.8
+file path=usr/share/man/man8/nsec3hash.8
+file path=usr/share/man/man8/pkcs11-destroy.8
+file path=usr/share/man/man8/pkcs11-keygen.8
+file path=usr/share/man/man8/pkcs11-list.8
+file path=usr/share/man/man8/pkcs11-tokens.8
+file path=usr/share/man/man8/rndc-confgen.8
 file path=usr/share/man/man8/rndc.8
+link path=usr/share/man/man8/tsig-keygen.8 target=ddns-confgen.8
+file Solaris/dns-server.8s path=usr/share/man/man8s/dns-server.8s \
+    mangler.bypass=true
 license bind.license license="ISC license"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/bind/patches/003-manpage-fix.patch	Thu Feb 16 12:50:39 2017 +0000
@@ -0,0 +1,68 @@
+This patch is created by Oracle to addresses a couple of issues with
+manual page references.  The ISC have been informed of these issues
+and a future release of BIND should make this patch obsolete.
+
+  1. "ndc" is no longer shipped now that rndc is established.
+  2. "nsupdate" continues to be delivered in section 1, not 8.
+  3. "mmencode" not provided with Solaris, use base64 for encoding secret.
+
+diff -r a04ae9b67db9 bin/rndc/rndc.8
+--- a/bin/rndc/rndc.8   Thu Nov 03 11:17:37 2016 +0000
++++ b/bin/rndc/rndc.8   Thu Nov 03 13:07:38 2016 +0000
+@@ -491,7 +491,6 @@
+ \fBrndc-confgen\fR(8),
+ \fBnamed\fR(8),
+ \fBnamed.conf\fR(5),
+-\fBndc\fR(8),
+ BIND 9 Administrator Reference Manual\&.
+ .SH "AUTHOR"
+ .PP
+diff -r a04ae9b67db9 bin/tools/named-journalprint.8
+--- a/bin/tools/named-journalprint.8    Thu Nov 03 11:17:37 2016 +0000
++++ b/bin/tools/named-journalprint.8    Thu Nov 03 13:07:38 2016 +0000
+@@ -65,7 +65,7 @@
+ .SH "SEE ALSO"
+ .PP
+ \fBnamed\fR(8),
+-\fBnsupdate\fR(8),
++\fBnsupdate\fR(1),
+ BIND 9 Administrator Reference Manual\&.
+ .SH "AUTHOR"
+ .PP
+--- a/bin/rndc/rndc.conf.5	Fri Oct 21 06:10:54 2016
++++ b/bin/rndc/new.rndc.conf.5	Fri Feb 17 11:51:48 2017
+@@ -120,10 +120,9 @@
+ There are two common ways to generate the base\-64 string for the secret\&. The BIND 9 program
+ \fBrndc\-confgen\fR
+ can be used to generate a random key, or the
+-\fBmmencode\fR
+-program, also known as
+-\fBmimencode\fR, can be used to generate a base\-64 string from known input\&.
+-\fBmmencode\fR
++\fBbase64\fR
++program can be used to generate a base\-64 string from known input\&.
++\fBbase64\fR
+ does not ship with BIND 9 but is available on many systems\&. See the EXAMPLE section for sample command lines for each\&.
+ .SH "EXAMPLE"
+ .PP
+@@ -217,9 +216,9 @@
+ are also printed\&.
+ .PP
+ To generate a base\-64 secret with
+-\fBmmencode\fR:
++\fBbase64\fR:
+ .PP
+-\fBecho "known plaintext for a secret" | mmencode\fR
++\fBecho -n "known plaintext for a secret" | base64\fR
+ .SH "NAME SERVER CONFIGURATION"
+ .PP
+ The name server must be configured to accept rndc connections and to recognize the key specified in the
+@@ -232,7 +231,7 @@
+ .PP
+ \fBrndc\fR(8),
+ \fBrndc-confgen\fR(8),
+-\fBmmencode\fR(1),
++\fBbase64\fR(1),
+ BIND 9 Administrator Reference Manual\&.
+ .SH "AUTHOR"
+ .PP