diff --git a/doc/arm/Bv9ARM.ch09.html b/doc/arm/Bv9ARM.ch09.html
index 084eb4dc47..870e11260d 100644
--- a/doc/arm/Bv9ARM.ch09.html
+++ b/doc/arm/Bv9ARM.ch09.html
@@ -175,6 +175,15 @@
 	  [RT #45181]
 	</p>
       </li>
+<li class="listitem">
+	<p>
+	  Addresses could be referenced after being freed during resolver
+	  processing, causing an assertion failure. The chances of this
+	  happening were remote, but the introduction of a delay in
+	  resolution increased them. This bug is disclosed in
+	  CVE-2017-3145. [RT #46839]
+	</p>
+      </li>
 </ul></div>
   </div>
 
@@ -279,6 +288,15 @@
 <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>
+	  Attempting to validate improperly unsigned CNAME responses
+	  from secure zones could cause a validator loop. This caused
+	  a delay in returning SERVFAIL and also increased the chances
+	  of encountering the crash bug described in CVE-2017-3145.
+	  [RT #46839]
+	</p>
+      </li>
 <li class="listitem">
 	<p>
 	  When <span class="command"><strong>named</strong></span> was reconfigured, failure of some
diff --git a/doc/arm/notes.html b/doc/arm/notes.html
index 34e75ee8c8..9863f4c344 100644
--- a/doc/arm/notes.html
+++ b/doc/arm/notes.html
@@ -135,6 +135,15 @@
 	  [RT #45181]
 	</p>
       </li>
+<li class="listitem">
+	<p>
+	  Addresses could be referenced after being freed during resolver
+	  processing, causing an assertion failure. The chances of this
+	  happening were remote, but the introduction of a delay in
+	  resolution increased them. This bug is disclosed in
+	  CVE-2017-3145. [RT #46839]
+	</p>
+      </li>
 </ul></div>
   </div>
 
@@ -239,6 +248,15 @@
 <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>
+	  Attempting to validate improperly unsigned CNAME responses
+	  from secure zones could cause a validator loop. This caused
+	  a delay in returning SERVFAIL and also increased the chances
+	  of encountering the crash bug described in CVE-2017-3145.
+	  [RT #46839]
+	</p>
+      </li>
 <li class="listitem">
 	<p>
 	  When <span class="command"><strong>named</strong></span> was reconfigured, failure of some