diff --git a/CHANGES b/CHANGES
index 3ec56b9c9e..339a5046f1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+5169.	[bug]		The presence of certain types in an otherwise
+			empty node could cause a crash while processing a
+			type ANY query. [GL #901]
+
 5168.	[bug]		Do not crash on shutdown when RPZ fails to load.  Also,
 			keep previous version of the database if RPZ fails to
 			load. [GL #813]
diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index 8ae3174604..3dc8716a07 100644
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -127,7 +127,9 @@
     <itemizedlist>
       <listitem>
         <para>
-          None.
+	  The presence of certain record types in an otherwise empty
+	  node of a zone could trigger an assertion failure while processing
+	  a query of type ANY. [GL #901]
 	</para>
       </listitem>
     </itemizedlist>