diff --git a/FAQ b/FAQ
index 29475d47a1..6a75e8af81 100644
--- a/FAQ
+++ b/FAQ
@@ -1,8 +1,6 @@
-Copyright ? 2004-2010, 2013, 2014 Internet Systems Consortium, Inc.
+Copyright ? 2000-2010, 2013-2016 Internet Systems Consortium, Inc.
 ("ISC")
 
-Copyright ? 2000-2003 Internet Software Consortium.
-
 -----------------------------------------------------------------------
 
 1. Compilation and Installation Questions
diff --git a/FAQ.xml b/FAQ.xml
index 1c7748bba6..484c40fc74 100644
--- a/FAQ.xml
+++ b/FAQ.xml
@@ -9,8 +9,12 @@
 <!-- Converted by db4-upgrade version 1.0 -->
 <article xmlns="http://docbook.org/ns/docbook" version="5.0" class="faq">
 
-  <info>
+  <articleinfo>
     <copyright>
+      <year>2000</year>
+      <year>2001</year>
+      <year>2002</year>
+      <year>2003</year>
       <year>2004</year>
       <year>2005</year>
       <year>2006</year>
@@ -20,16 +24,11 @@
       <year>2010</year>
       <year>2013</year>
       <year>2014</year>
+      <year>2015</year>
+      <year>2016</year>
       <holder>Internet Systems Consortium, Inc. ("ISC")</holder>
     </copyright>
-    <copyright>
-      <year>2000</year>
-      <year>2001</year>
-      <year>2002</year>
-      <year>2003</year>
-      <holder>Internet Software Consortium.</holder>
-    </copyright>
-  </info>
+  </articleinfo>
   <qandaset defaultlabel="qanda">
 
     <qandadiv><title>Compilation and Installation Questions</title>
diff --git a/doc/arm/Bv9ARM.ch09.html b/doc/arm/Bv9ARM.ch09.html
index 9e507ec33c..5c33e1a310 100644
--- a/doc/arm/Bv9ARM.ch09.html
+++ b/doc/arm/Bv9ARM.ch09.html
@@ -141,7 +141,7 @@
 	  mechanism.
 	</p>
 <p>
-      This feature should be considered experimental. It currently
+	  This feature should be considered experimental. It currently
 	  supports only basic features; more advanced features such as
 	  ACLs and TSIG keys are not yet supported. Example catalog
 	  zone configurations can be found in the Chapter 9 of the
@@ -150,10 +150,11 @@
 <p>
 	  Support for master entries with TSIG keys has been added to catalog
 	  zones, as well as support for allow-query and allow-transfer.
-		</p>
+	</p>
 </li>
 <li class="listitem"><p>
-	  Added rndc python module.
+	  Added an <span class="command"><strong>isc.rndc</strong></span> Python module, which allows
+	  <span class="command"><strong>rndc</strong></span> commands to be sent from Python programs.
 	</p></li>
 <li class="listitem">
 <p>
@@ -384,6 +385,10 @@
 	  <span class="command"><strong>dig +mapped</strong></span> can now be used to determine
 	  if mapped IPv4 addresses can be used.
 	</p></li>
+<li class="listitem"><p>
+	  <span class="command"><strong>nslookup</strong></span> will now look up IPv6 as well
+	  as IPv4 addresses by default. [RT #40420]
+	</p></li>
 <li class="listitem"><p>
 	  <code class="option">serial-update-method</code> can now be set to
 	  <code class="literal">date</code>. On update, the serial number will
@@ -453,6 +458,32 @@
 	  configuration for a specified zone.
 	</p></li>
 <li class="listitem">
+<p>
+	  When BIND is built with the <span class="command"><strong>lmdb</strong></span> library
+	  (Lightning Memory-Mapped Database), <span class="command"><strong>named</strong></span>
+	  will store the configuration information for zones
+	  that are added via <span class="command"><strong>rndc addzone</strong></span>
+	  in a database, rather than in a flat "NZF" file.  This
+	  dramatically improves performance for
+	  <span class="command"><strong>rndc delzone</strong></span> and
+	  <span class="command"><strong>rndc modzone</strong></span>: deleting or changing
+	  the contents of a database is much faster than rewriting
+	  a text file.
+	</p>
+<p>
+	  On startup, if <span class="command"><strong>named</strong></span> finds an existing
+	  NZF file, it will automatically convert it to the new NZD
+	  database format.
+	</p>
+<p>
+	  To view the contents of an NZD, or to convert an
+	  NZD back to an NZF file (for example, to revert back
+	  to an earlier version of BIND which did not support the
+	  NZD format), use the new command <span class="command"><strong>named-nzd2nzf</strong></span>
+	  [RT #39837]
+	</p>
+</li>
+<li class="listitem">
 <p>
 	  Added server-side support for pipelined TCP queries.  Clients
 	  may continue sending queries via TCP while previous queries are
diff --git a/doc/arm/notes.html b/doc/arm/notes.html
index b6889a698b..2b7bab524d 100644
--- a/doc/arm/notes.html
+++ b/doc/arm/notes.html
@@ -102,7 +102,7 @@
 	  mechanism.
 	</p>
 <p>
-      This feature should be considered experimental. It currently
+	  This feature should be considered experimental. It currently
 	  supports only basic features; more advanced features such as
 	  ACLs and TSIG keys are not yet supported. Example catalog
 	  zone configurations can be found in the Chapter 9 of the
@@ -111,10 +111,11 @@
 <p>
 	  Support for master entries with TSIG keys has been added to catalog
 	  zones, as well as support for allow-query and allow-transfer.
-		</p>
+	</p>
 </li>
 <li class="listitem"><p>
-	  Added rndc python module.
+	  Added an <span class="command"><strong>isc.rndc</strong></span> Python module, which allows
+	  <span class="command"><strong>rndc</strong></span> commands to be sent from Python programs.
 	</p></li>
 <li class="listitem">
 <p>
@@ -345,6 +346,10 @@
 	  <span class="command"><strong>dig +mapped</strong></span> can now be used to determine
 	  if mapped IPv4 addresses can be used.
 	</p></li>
+<li class="listitem"><p>
+	  <span class="command"><strong>nslookup</strong></span> will now look up IPv6 as well
+	  as IPv4 addresses by default. [RT #40420]
+	</p></li>
 <li class="listitem"><p>
 	  <code class="option">serial-update-method</code> can now be set to
 	  <code class="literal">date</code>. On update, the serial number will
@@ -414,6 +419,32 @@
 	  configuration for a specified zone.
 	</p></li>
 <li class="listitem">
+<p>
+	  When BIND is built with the <span class="command"><strong>lmdb</strong></span> library
+	  (Lightning Memory-Mapped Database), <span class="command"><strong>named</strong></span>
+	  will store the configuration information for zones
+	  that are added via <span class="command"><strong>rndc addzone</strong></span>
+	  in a database, rather than in a flat "NZF" file.  This
+	  dramatically improves performance for
+	  <span class="command"><strong>rndc delzone</strong></span> and
+	  <span class="command"><strong>rndc modzone</strong></span>: deleting or changing
+	  the contents of a database is much faster than rewriting
+	  a text file.
+	</p>
+<p>
+	  On startup, if <span class="command"><strong>named</strong></span> finds an existing
+	  NZF file, it will automatically convert it to the new NZD
+	  database format.
+	</p>
+<p>
+	  To view the contents of an NZD, or to convert an
+	  NZD back to an NZF file (for example, to revert back
+	  to an earlier version of BIND which did not support the
+	  NZD format), use the new command <span class="command"><strong>named-nzd2nzf</strong></span>
+	  [RT #39837]
+	</p>
+</li>
+<li class="listitem">
 <p>
 	  Added server-side support for pipelined TCP queries.  Clients
 	  may continue sending queries via TCP while previous queries are