diff --git a/bin/dig/nslookup.1 b/bin/dig/nslookup.1
index ee9106b4fe..8bc92d8478 100644
--- a/bin/dig/nslookup.1
+++ b/bin/dig/nslookup.1
@@ -281,6 +281,10 @@ Try the next nameserver if a nameserver responds with SERVFAIL or a referral (no
 .RE
 .sp
 .RE
+.SH "RETURN VALUES"
+.PP
+\fBnslookup\fR
+returns with an exit status of 1 if any query failed, and 0 otherwise\&.
 .SH "FILES"
 .PP
 /etc/resolv\&.conf
diff --git a/bin/dig/nslookup.html b/bin/dig/nslookup.html
index ec8d16eaf9..f710027349 100644
--- a/bin/dig/nslookup.html
+++ b/bin/dig/nslookup.html
@@ -298,12 +298,19 @@ nslookup -query=hinfo  -timeout=10
 </dl></div>
 </div>
 <div class="refsection">
-<a name="id-1.10"></a><h2>FILES</h2>
+<a name="id-1.10"></a><h2>RETURN VALUES</h2>
+<p>
+      <span class="command"><strong>nslookup</strong></span> returns with an exit status of 1
+      if any query failed, and 0 otherwise.
+    </p>
+</div>
+<div class="refsection">
+<a name="id-1.11"></a><h2>FILES</h2>
 <p><code class="filename">/etc/resolv.conf</code>
     </p>
 </div>
 <div class="refsection">
-<a name="id-1.11"></a><h2>SEE ALSO</h2>
+<a name="id-1.12"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">dig</span>(1)</span>,
       <span class="citerefentry"><span class="refentrytitle">host</span>(1)</span>,
       <span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>.
diff --git a/doc/arm/Bv9ARM.ch09.html b/doc/arm/Bv9ARM.ch09.html
index 591c1caa75..8b0796afb5 100644
--- a/doc/arm/Bv9ARM.ch09.html
+++ b/doc/arm/Bv9ARM.ch09.html
@@ -189,14 +189,16 @@
 	</p>
 </li>
 <li class="listitem"><p>
-	  Specfic APL data could trigger a INSIST.  This flaw was discovered
-	  by Brian Mitchell and is disclosed in CVE-2015-8704. [RT #41396]
+	  Specific APL data could trigger an INSIST.  This flaw
+	  was discovered by Brian Mitchell and is disclosed in
+	  CVE-2015-8704. [RT #41396]
 	</p></li>
 <li class="listitem"><p>
-	  render_ecs errors when printing out a OPT record were
-	  mishandled resulting in a assertion failure. This flaw
-	  was discovered by Brian Mitchell and is disclosed in
-	  CVE-2015-8705. [RT #41396]
+	  Certain errors that could be encountered when printing out
+	  or logging an OPT record containing a CLIENT-SUBNET option
+	  could be mishandled, resulting in an assertion failure.
+	  This flaw was discovered by Brian Mitchell and is disclosed
+	  in CVE-2015-8705. [RT #41396]
 	</p></li>
 </ul></div>
 </div>
@@ -677,6 +679,11 @@
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_bugs"></a>Bug Fixes</h3></div></div></div>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p>
+	  Authoritative servers that were marked as bogus (e.g. blackholed
+	  in configuration or with invalid addresses) were being queried
+	  anyway. [RT #41321]
+	</p></li>
 <li class="listitem"><p>
 	  Some of the options for GeoIP ACLs, including "areacode",
 	  "metrocode", and "timezone", were incorrectly documented
diff --git a/doc/arm/notes.html b/doc/arm/notes.html
index aae029b7fe..49ae2e5707 100644
--- a/doc/arm/notes.html
+++ b/doc/arm/notes.html
@@ -150,14 +150,16 @@
 	</p>
 </li>
 <li class="listitem"><p>
-	  Specfic APL data could trigger a INSIST.  This flaw was discovered
-	  by Brian Mitchell and is disclosed in CVE-2015-8704. [RT #41396]
+	  Specific APL data could trigger an INSIST.  This flaw
+	  was discovered by Brian Mitchell and is disclosed in
+	  CVE-2015-8704. [RT #41396]
 	</p></li>
 <li class="listitem"><p>
-	  render_ecs errors when printing out a OPT record were
-	  mishandled resulting in a assertion failure. This flaw
-	  was discovered by Brian Mitchell and is disclosed in
-	  CVE-2015-8705. [RT #41396]
+	  Certain errors that could be encountered when printing out
+	  or logging an OPT record containing a CLIENT-SUBNET option
+	  could be mishandled, resulting in an assertion failure.
+	  This flaw was discovered by Brian Mitchell and is disclosed
+	  in CVE-2015-8705. [RT #41396]
 	</p></li>
 </ul></div>
 </div>
@@ -638,6 +640,11 @@
 <div class="titlepage"><div><div><h3 class="title">
 <a name="relnotes_bugs"></a>Bug Fixes</h3></div></div></div>
 <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p>
+	  Authoritative servers that were marked as bogus (e.g. blackholed
+	  in configuration or with invalid addresses) were being queried
+	  anyway. [RT #41321]
+	</p></li>
 <li class="listitem"><p>
 	  Some of the options for GeoIP ACLs, including "areacode",
 	  "metrocode", and "timezone", were incorrectly documented