diff --git a/CHANGES b/CHANGES
index a6e75743f0..a1567ae726 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5506.	[bug]		Properly handle failed sysconf() calls, so we don't
+			report invalid memory size. [GL #2166]
+
 	--- 9.11.23 released ---
 
 5497.	[bug]		'dig +bufsize=0' failed to disable EDNS. [GL #2054]
diff --git a/doc/arm/notes-9.11.24.xml b/doc/arm/notes-9.11.24.xml
index e8f1f02e9a..c18f665930 100644
--- a/doc/arm/notes-9.11.24.xml
+++ b/doc/arm/notes-9.11.24.xml
@@ -65,7 +65,9 @@
     <itemizedlist>
       <listitem>
         <para>
-          None.
+	  <command>named</command> would report invalid memory size when running
+	  in an environment that doesn't properly report number of available
+	  memory pages or pagesize.  [GL #2166] None.
         </para>
       </listitem>
     </itemizedlist>