diff --git a/CHANGES b/CHANGES
index ba462c9a4e..1ffad6a3d4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2655.	[doc]		Document that key-directory does not affect
+			bind.keys, rndc.key or session.key.  [RT #20155]
+
 2654.	[bug]		Improve error reporting on duplicated names for
 			deny-answer-xxx. [RT #20164]
 
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 13137cacf4..1c94c42435 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- File: $Id: Bv9ARM-book.xml,v 1.424 2009/07/27 00:43:13 each Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.425 2009/08/25 02:56:03 marka Exp $ -->
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>BIND 9 Administrator Reference Manual</title>
 
@@ -5118,11 +5118,14 @@ badresp:1,adberr:0,findfail:0,valfail:0]
             <listitem>
               <para>
                 When performing dynamic update of secure zones, the
-                directory where the public and private key files should be
-                found,
-                if different than the current working directory.  The
-                directory specified
-                must be an absolute path.
+                directory where the public and private DNSSEC key files
+                should be found, if different than the current working
+                directory.  The directory specified must be an absolute
+                path.  (Note that this option has no effect on the paths
+                for files containing non-DNSSEC keys such as
+                <filename>bind.keys</filename>,
+                <filename>rndc.key</filename> or
+                <filename>session.key</filename>.)
               </para>
             </listitem>
           </varlistentry>