diff --git a/CHANGES b/CHANGES
index 46544b0df1..817ab532cc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -99,8 +99,8 @@
 1074.	[bug]		Running out of memory in dump_rdataset() could
 			cause an assertion failure. [RT #1946]
 
-1073.	[bug]		The adb cache should also be space driven,
-			max-adb-size.  [RT #1915, #1938]
+1073.	[bug]		The adb cache should also be space driven.
+			[RT #1915, #1938]
 
 1072.	[bug]		The TCP client quota could be exceeded when
 			recursion occurred. [RT #1937]
diff --git a/bin/named/config.c b/bin/named/config.c
index bb8503ed01..0e95c8bf8a 100644
--- a/bin/named/config.c
+++ b/bin/named/config.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.c,v 1.17 2001/10/25 04:57:37 marka Exp $ */
+/* $Id: config.c,v 1.18 2001/11/07 03:52:15 marka Exp $ */
 
 #include <config.h>
 
@@ -116,7 +116,6 @@ options {\n\
 	max-ncache-ttl 10800; /* 3 hours */\n\
 	max-cache-ttl 604800; /* 1 week */\n\
 	transfer-format many-answers;\n\
-	max-adb-size 0;\n\
 	max-cache-size 0;\n\
 	check-names master ignore;\n\
 	check-names slave ignore;\n\
diff --git a/bin/named/server.c b/bin/named/server.c
index faccb08df9..c488d0c5ff 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: server.c,v 1.358 2001/10/29 19:30:11 gson Exp $ */
+/* $Id: server.c,v 1.359 2001/11/07 03:52:16 marka Exp $ */
 
 #include <config.h>
 
@@ -646,32 +646,13 @@ configure_view(dns_view_t *view, cfg_obj_t *config, cfg_obj_t *vconfig,
 		dns_dispatch_detach(&dispatch6);
 
 	/*
-	 * Set ADB cache size
+	 * Set the ADB cache size to 1/8th of the max-cache-size.
 	 */
-	obj = NULL;
-	result = ns_config_get(maps, "max-adb-size", &obj);
-	INSIST(result == ISC_R_SUCCESS);
-	if (cfg_obj_isstring(obj)) {
-		str = cfg_obj_asstring(obj);
-		INSIST(strcasecmp(str, "unlimited") == 0);
-		max_adb_size = ISC_UINT32_MAX;
-	} else {
-		isc_resourcevalue_t value;
-		value = cfg_obj_asuint64(obj);
-		if (value > ISC_UINT32_MAX) {
-			cfg_obj_log(obj, ns_g_lctx, ISC_LOG_ERROR,
-				    "'max-adb-size "
-				    "%" ISC_PRINT_QUADFORMAT "d' is too large",
-				    value);
-			result = ISC_R_RANGE;
-			goto cleanup;
-		}
-		max_adb_size = (isc_uint32_t)value;
-		if (max_adb_size == 0 && max_cache_size != 0) {
-			max_adb_size = max_cache_size/8;
-			if (max_adb_size == 0)
-				max_adb_size = 1;	/* Force minimum. */
-		}
+	max_adb_size = 0;
+	if (max_cache_size != 0) {
+		max_adb_size = max_cache_size/8;
+		if (max_adb_size == 0)
+			max_adb_size = 1;	/* Force minimum. */
 	}
 	dns_adb_setadbsize(view->adb, max_adb_size);
 
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index e0a5925f15..944d88eebb 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.172 2001/11/07 03:10:25 marka Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.173 2001/11/07 03:52:19 marka Exp $ -->
 
 <book>
 <title>BIND 9 Administrator Reference Manual</title>
@@ -2832,7 +2832,6 @@ statement in the <filename>named.conf</filename> file:</para>
     <optional> additional-from-auth <replaceable>yes_or_no</replaceable> ; </optional>
     <optional> additional-from-cache <replaceable>yes_or_no</replaceable> ; </optional>
     <optional> random-device <replaceable>path_name</replaceable> ; </optional>
-    <optional> max-adb-size <replaceable>size_spec</replaceable> ; </optional>
     <optional> max-cache-size <replaceable>size_spec</replaceable> ; </optional>
     <optional> match-mapped-addresses <replaceable>yes_or_no</replaceable>; </optional>
 };
@@ -3659,7 +3658,6 @@ amount of memory used by the server, but it can be used
 to raise an operating system data size limit that is
 too small by default.  If you wish to limit the amount
 of memory used by the server, use the
-<command>max-adb-size</command> and 
 <command>max-cache-size</command> and 
 <command>recursive-clients</command>
 options instead.
@@ -3710,17 +3708,6 @@ connections that the server will accept.
 The default is <literal>100</literal>.</para>
 </listitem></varlistentry>
 
-<varlistentry><term><command>max-adb-size</command></term>
-<listitem><para>The server maintains a per view cache of remote
-server characteristics including addresses constructed from A6
-chains.  The amount of memory used for this cache can be set via
-<command>max-adb-size</command> and defaults to 1/8th of
-<command>max-cache-size</command> if that is set otherwise it is
-<literal>unlimited</literal>, meaning that records are purged from
-the cache only when their TTLs expire.
-</para>
-</listitem></varlistentry>
-
 <varlistentry><term><command>max-cache-size</command></term>
 <listitem><para>The maximum amount of memory to use for the
 server's cache, in bytes.  When the amount of data in the cache
diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index a8ba7182da..6c1eeed8ad 100644
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: parser.c,v 1.88 2001/11/05 22:24:31 gson Exp $ */
+/* $Id: parser.c,v 1.89 2001/11/07 03:52:20 marka Exp $ */
 
 #include <config.h>
 
@@ -928,7 +928,6 @@ view_clauses[] = {
 	{ "max-cache-ttl", &cfg_type_uint32, 0 },
 	{ "transfer-format", &cfg_type_transferformat, 0 },
 	{ "max-cache-size", &cfg_type_sizenodefault, 0 },
-	{ "max-adb-size", &cfg_type_sizenodefault, 0 },
 	{ "check-names", &cfg_type_checknames,
 	  CFG_CLAUSEFLAG_MULTI | CFG_CLAUSEFLAG_NOTIMP },
 	{ "cache-file", &cfg_type_qstring, 0 },