diff --git a/CHANGES b/CHANGES
index 61fb7613f2..394f24cfe6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1698.	[doc]		Use reserved IPv6 documentation prefix.
+
 1697.	[bug]		xxx-source{,-v6} was not effective when it
 			specified one of listening addresses and a
 			different port than the listening port. [RT #12257]
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 3cda953c8d..25315785bb 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.0//EN"
                "http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd">
 
-<!-- File: $Id: Bv9ARM-book.xml,v 1.252 2004/08/15 04:48:19 jinmei Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.253 2004/08/16 00:34:33 marka Exp $ -->
 
 <book>
 <title>BIND 9 Administrator Reference Manual</title>
@@ -1589,7 +1589,7 @@ statement, as described later in this document. </para>
 
 <programlisting>
 $ORIGIN example.com.
-host            3600    IN      AAAA    2001:4f8:201:1860:42::1
+host            3600    IN      AAAA    2001:db8::1
 </programlisting>
 
         <para>It is recommended that IPv4-in-IPv6 mapped addresses not
@@ -1605,11 +1605,11 @@ host            3600    IN      AAAA    2001:4f8:201:1860:42::1
       <literal>ip6.arpa.</literal> is appended to the resulting name.
       For example, the following would provide reverse name lookup for
       a host with address
-      <literal>2001:4f8:201:1860:42::1</literal>.</para>
+      <literal>2001:db8::1</literal>.</para>
 
 <programlisting>
-$ORIGIN 0.6.8.1.1.0.2.0.8.f.4.0.1.0.0.2.ip6.arpa.
-1.0.0.0.0.0.0.0.0.0.0.0.2.4.0.0   14400 IN      PTR     host.example.com.
+$ORIGIN 0.0.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa.
+1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0   14400 IN      PTR     host.example.com.
 </programlisting>
     </sect2>
   </sect1>
@@ -1712,7 +1712,7 @@ in <varname>dotted_decimal</varname> notation.</para></entry>
 </row>
 <row rowsep = "0">
 <entry colname = "1"><para><varname>ip6_addr</varname></para></entry>
-<entry colname = "2"><para>An IPv6 address, such as <command>2001:ffff::200:f8ff:fe01:9742</command>.
+<entry colname = "2"><para>An IPv6 address, such as <command>2001:db8::1234</command>.
 IPv6 scoped addresses that have ambiguity on their scope zones must be
 disambiguated by an appropriate zone ID with the percent character
 (`%') as delimiter.
@@ -3517,13 +3517,13 @@ regardless of whether the desired API is supported by the system.</para>
 For example,</para>
 
 <programlisting>listen-on-v6 { any; };
-listen-on-v6 port 1234 { !3ffe::/16; any; };
+listen-on-v6 port 1234 { !2001:db8::/32; any; };
 </programlisting>
 
 <para>will enable the name server on port 53 for any IPv6 addresses
 (with a single wildcard socket),
 and on port 1234 of IPv6 addresses that is not in the prefix
-3ffe::/16 (with separate sockets for each matched address.)</para>
+2001:db8::/32 (with separate sockets for each matched address.)</para>
 
 <para>To make the server not listen on any IPv6 address, use</para>
 <programlisting>listen-on-v6 { none; };
@@ -5981,7 +5981,7 @@ last three bytes of the hardware address. The lowest significant
 bit of the first byte should then be complemented. Addresses are
 written as 32-bit blocks separated with a colon, and leading zeros
 of a block may be omitted, for example:</para>
-<para><command>2001:4f8:201:9:a00:20ff:fe81:2b32</command></para>
+<para><command>2001:db8:201:9:a00:20ff:fe81:2b32</command></para>
 <para>IPv6 address specifications are likely to contain long strings
 of zeros, so the architects have included a shorthand for specifying
 them. The double colon (`::') indicates the longest possible string