diff --git a/CHANGES b/CHANGES
index 113b30dd3f..f2fc2a58de 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+ 273.	[func]		The default for the 'transfer-format' option is
+			now 'many-answers'.  This will break zone transfers
+			to BIND 4.9.5 and older unless there is an explicit
+			'one-answer' configuration.
+
  272.	[bug]		The sending of large TCP responses was canceled
 			in mid-transmission due to a race condition
 			caused by the failure to set the client object's
@@ -19,7 +24,7 @@
 
  267.	[func]		Nsupdate is now provided in the distribution.
 
- 266.	[bug]		zone.c:save_nsrrset() node was not initalised.
+ 266.	[bug]		zone.c:save_nsrrset() node was not initalized.
 
  265.	[bug]		dns_request_create() now works for TCP.
 
@@ -36,7 +41,7 @@
 					severity error;
 				}
 
- 262.	[bug]		'master' was not initalised in zone.c:stub_callback().
+ 262.	[bug]		'master' was not initalized in zone.c:stub_callback().
 
  261.	[func]		Add dns_zone_markdirty().
 
@@ -804,7 +809,7 @@
   53.	[port]		freebsd 4.0: lib/isc/unix/socket.c requires
 			<sys/param.h>.
 
-  52.	[bug]		rndc: taskmgr and socketmgr were not initaliased
+  52.	[bug]		rndc: taskmgr and socketmgr were not initialized
 			to NULL.
 
   51.   [cleanup]       dns/compress.h and dns/zt.h did not need to include
diff --git a/bin/named/server.c b/bin/named/server.c
index 124abbe7dd..1e1ccf925f 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: server.c,v 1.199 2000/06/22 21:49:35 tale Exp $ */
+/* $Id: server.c,v 1.200 2000/06/23 01:08:29 gson Exp $ */
 
 #include <config.h>
 
@@ -605,11 +605,15 @@ configure_view(dns_view_t *view, dns_c_ctx_t *cctx, dns_c_view_t *cview,
 	if (cview != NULL)
 		(void) dns_c_view_getauthnxdomain(cview, &view->auth_nxdomain);
 
-	view->transfer_format = dns_one_answer;	
-	(void) dns_c_ctx_gettransferformat(cctx, &view->transfer_format);
+	result = ISC_R_NOTFOUND;
 	if (cview != NULL)	
-		(void) dns_c_view_gettransferformat(cview,
-						    &view->transfer_format);
+		result = dns_c_view_gettransferformat(cview,
+						      &view->transfer_format);
+	if (result != ISC_R_SUCCESS)
+		result = dns_c_ctx_gettransferformat(cctx,
+						     &view->transfer_format);
+	if (result != ISC_R_SUCCESS)
+		view->transfer_format = dns_many_answers;
 
 	CHECK(configure_view_acl(cview, cctx, actx, ns_g_mctx,
 				 dns_c_view_getallowquery,
@@ -1188,7 +1192,7 @@ load_configuration(const char *filename, ns_server_t *server,
 		} else {
 			/* Not specified, use default. */
 			CHECK(ns_listenlist_default(ns_g_mctx, listen_port,
-						    &listenon));
+						    ISC_TRUE, &listenon));
 		}
 		ns_interfacemgr_setlistenon4(server->interfacemgr, listenon);
 		ns_listenlist_detach(&listenon);
@@ -1210,7 +1214,7 @@ load_configuration(const char *filename, ns_server_t *server,
 		} else {
 			/* Not specified, use default. */
 			CHECK(ns_listenlist_default(ns_g_mctx, listen_port,
-						    &listenon));
+						    ISC_FALSE, &listenon));
 		}
 		ns_interfacemgr_setlistenon6(server->interfacemgr, listenon);
 		ns_listenlist_detach(&listenon);