diff --git a/CHANGES b/CHANGES
index a740d04ef1..be60117fb0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+2336.	[func]		If "named -6" is specified then listen on all IPv6
+			interfaces if there are not listen-on-v6 clauses in
+			named.conf.  [RT #17581]
+
 2335.	[port]		sunos:  libbind and *printf() support for long long. 
 			[RT #17513]
 
diff --git a/bin/named/server.c b/bin/named/server.c
index b1466f1e7f..0a0ec984af 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.501 2008/01/24 02:00:44 jinmei Exp $ */
+/* $Id: server.c,v 1.502 2008/02/18 04:43:47 marka Exp $ */
 
 /*! \file */
 
@@ -3105,11 +3105,13 @@ load_configuration(const char *filename, ns_server_t *server,
 							  ns_g_mctx,
 							  &listenon);
 		} else if (!ns_g_lwresdonly) {
+			isc_boolean_t enable;
 			/*
 			 * Not specified, use default.
 			 */
+			enable = ISC_TF(isc_net_probeipv4() != ISC_R_SUCCESS);
 			CHECK(ns_listenlist_default(ns_g_mctx, listen_port,
-						    ISC_FALSE, &listenon));
+						    enable, &listenon));
 		}
 		if (listenon != NULL) {
 			ns_interfacemgr_setlistenon6(server->interfacemgr,
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index d22516363e..08fa847b99 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.344 2008/01/18 01:59:07 jinmei Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.345 2008/02/18 04:43:47 marka Exp $ -->
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>BIND 9 Administrator Reference Manual</title>
 
@@ -6169,7 +6169,7 @@ listen-on port 1234 { !1.2.3.4; 1.2/16; };
 
           <para>
             If no <command>listen-on</command> is specified, the
-            server will listen on port 53 on all interfaces.
+            server will listen on port 53 on all IPv4 interfaces.
           </para>
 
           <para>
@@ -6227,8 +6227,10 @@ listen-on-v6 port 1234 { !2001:db8::/32; any; };
 
           <para>
             If no <command>listen-on-v6</command> option is
-            specified,
-            the server will not listen on any IPv6 address.
+            specified, the server will not listen on any IPv6 address
+	    unless <command>-6</command> is specified when named is
+	    invoked.  If <command>-6</command> is specified then
+	    named will listen on port 53 on all IPv6 interfaces by default.
           </para>
         </sect3>