diff --git a/CHANGES b/CHANGES
index 89a4fe5a2b..9ce8e1f48d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
 1114.	[port]		Ignore more accept() errors. [RT #2021]
 
-1113.	[bug]		allow-update/allow-update-forwarding did not work
-			when specified in a view.  [RT #2014]
+1113.	[bug]		The allow-update-forwarding option was ignored
+			when specified in a view. [RT #2014]
 
 1112.	[placeholder]
 
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 08ae60b6ae..2525ee0e82 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.174 2001/11/08 05:36:20 marka Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.175 2001/11/08 21:13:42 gson Exp $ -->
 
 <book>
 <title>BIND 9 Administrator Reference Manual</title>
@@ -2782,7 +2782,6 @@ statement in the <filename>named.conf</filename> file:</para>
     <optional> allow-query { <replaceable>address_match_list</replaceable> }; </optional>
     <optional> allow-transfer { <replaceable>address_match_list</replaceable> }; </optional>
     <optional> allow-recursion { <replaceable>address_match_list</replaceable> }; </optional>
-    <optional> allow-update { <replaceable>address_match_list</replaceable> }; </optional>
     <optional> allow-update-forwarding { <replaceable>address_match_list</replaceable> }; </optional>
     <optional> allow-v6-synthesis { <replaceable>address_match_list</replaceable> }; </optional>
     <optional> blackhole { <replaceable>address_match_list</replaceable> }; </optional>
@@ -3384,12 +3383,6 @@ host from retrieving data that is already in the server's cache.
 </para>
 </listitem></varlistentry>
 
-<varlistentry><term><command>allow-update</command></term>
-<listitem><para>Specifies which hosts are allowed to
-submit Dynamic DNS updates for master zones. The default is to deny
-updates from all hosts.</para>
-</listitem></varlistentry>
-
 <varlistentry><term><command>allow-update-forwarding</command></term>
 <listitem><para>Specifies which hosts are allowed to
 submit Dynamic DNS updates to slave zones to be forwarded to the
@@ -4503,8 +4496,9 @@ in <xref linkend="access_control"/>.</para>
 </listitem></varlistentry>
 
 <varlistentry><term><command>allow-update</command></term>
-<listitem><para>See the description of <command>allow-update</command>
-in <xref linkend="access_control"/>.</para>
+<listitem><para>Specifies which hosts are allowed to
+submit Dynamic DNS updates for master zones. The default is to deny
+updates from all hosts.</para>
 </listitem></varlistentry>
 
 <varlistentry><term><command>update-policy</command></term>
diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index c4338b649e..dfd66e95ae 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.90 2001/11/07 04:25:19 marka Exp $ */
+/* $Id: parser.c,v 1.91 2001/11/08 21:13:41 gson Exp $ */
 
 #include <config.h>
 
@@ -898,7 +898,6 @@ options_clauses[] = {
 static cfg_clausedef_t
 view_clauses[] = {
 	{ "allow-notify", &cfg_type_bracketed_aml, 0 },
-	{ "allow-update-forwarding", &cfg_type_bracketed_aml, 0 },
 	{ "allow-recursion", &cfg_type_bracketed_aml, 0 },
 	{ "allow-v6-synthesis", &cfg_type_bracketed_aml, 0 },
 	{ "sortlist", &cfg_type_bracketed_aml, 0 },
@@ -952,6 +951,7 @@ static cfg_clausedef_t
 zone_clauses[] = {
 	{ "allow-query", &cfg_type_bracketed_aml, 0 },
 	{ "allow-transfer", &cfg_type_bracketed_aml, 0 },
+	{ "allow-update-forwarding", &cfg_type_bracketed_aml, 0 },
 	{ "notify", &cfg_type_notifytype, 0 },
 	{ "also-notify", &cfg_type_portiplist, 0 },
 	{ "dialup", &cfg_type_dialuptype, 0 },
@@ -983,7 +983,6 @@ static cfg_clausedef_t
 zone_only_clauses[] = {
 	{ "type", &cfg_type_zonetype, 0 },
 	{ "allow-update", &cfg_type_bracketed_aml, 0 },
-	{ "allow-update-forwarding", &cfg_type_bracketed_aml, 0 },
 	{ "file", &cfg_type_qstring, 0 },
 	{ "ixfr-base", &cfg_type_qstring, CFG_CLAUSEFLAG_OBSOLETE },
 	{ "ixfr-tmp-file", &cfg_type_qstring, CFG_CLAUSEFLAG_OBSOLETE },