diff --git a/bin/confgen/ddns-confgen.8 b/bin/confgen/ddns-confgen.8
index ff541a9c21..6066e47b0e 100644
--- a/bin/confgen/ddns-confgen.8
+++ b/bin/confgen/ddns-confgen.8
@@ -12,7 +12,7 @@
 .\" OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 .\" PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $Id: ddns-confgen.8,v 1.6 2009/06/16 01:12:45 tbox Exp $
+.\" $Id: ddns-confgen.8,v 1.7 2009/06/17 01:12:48 tbox Exp $
 .\"
 .hy 0
 .ad l
@@ -32,7 +32,7 @@
 ddns\-confgen \- ddns key generation tool
 .SH "SYNOPSIS"
 .HP 13
-\fBddns\-confgen\fR [\fB\-a\ \fR\fB\fIalgorithm\fR\fR] [\fB\-h\fR] [\fB\-k\ \fR\fB\fIkeyname\fR\fR] [\fB\-r\ \fR\fB\fIrandomfile\fR\fR] [\fB\-s\fR] [\fB\-q\fR] [name]
+\fBddns\-confgen\fR [\fB\-a\ \fR\fB\fIalgorithm\fR\fR] [\fB\-h\fR] [\fB\-k\ \fR\fB\fIkeyname\fR\fR] [\fB\-r\ \fR\fB\fIrandomfile\fR\fR] [\fB\-s\ name\ |\ \-z\ zone\fR] [\fB\-q\fR] [name]
 .SH "DESCRIPTION"
 .PP
 \fBddns\-confgen\fR
@@ -79,7 +79,16 @@ Prints a short summary of the options and arguments to
 \-k \fIkeyname\fR
 .RS 4
 Specifies the key name of the DDNS authentication key. The default is
-\fBddns\-key\fR. The key name must have the format of a valid domain name, consisting of letters, digits, hyphens and periods.
+\fBddns\-key\fR
+when neither the
+\fB\-s\fR
+nor
+\fB\-z\fR
+option is specified; otherwise, the default is
+\fBddns\-key\fR
+as a separate label followed by the argument of the option, e.g.,
+\fBddns\-key.example.com.\fR
+The key name must have the format of a valid domain name, consisting of letters, digits, hyphens and periods.
 .RE
 .PP
 \-q
@@ -98,11 +107,27 @@ specifies the name of a character device or file containing random data to be us
 indicates that keyboard input should be used.
 .RE
 .PP
-\-s
+\-s \fIname\fR
 .RS 4
 Self mode: The example
 \fBnamed.conf\fR
-text shows how to set an update policy using the "self" nametype, using a single key per each domain name for updates, instead of the "subdomain" nametype which allows matching on any name within a specified domain.
+text shows how to set an update policy for the specified
+\fIname\fR
+using the "self" nametype, instead of the "subdomain" nametype which allows matching on any name within a specified domain. This option cannot be used with the
+\fB\-z\fR
+option.
+.RE
+.PP
+\-z \fIzone\fR
+.RS 4
+zone mode: The example
+\fBnamed.conf\fR
+text shows how to set an update policy for the specified
+\fIzone\fR
+using the "zonesub" nametype, allowing updates to all subdomain names within that
+\fIzone\fR. This option cannot be used with the
+\fB\-s\fR
+option.
 .RE
 .SH "SEE ALSO"
 .PP
diff --git a/bin/confgen/ddns-confgen.html b/bin/confgen/ddns-confgen.html
index 6951c726cc..47997a9c9c 100644
--- a/bin/confgen/ddns-confgen.html
+++ b/bin/confgen/ddns-confgen.html
@@ -13,7 +13,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: ddns-confgen.html,v 1.6 2009/06/16 01:12:45 tbox Exp $ -->
+<!-- $Id: ddns-confgen.html,v 1.7 2009/06/17 01:12:48 tbox Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -28,7 +28,7 @@
 </div>
 <div class="refsynopsisdiv">
 <h2>Synopsis</h2>
-<div class="cmdsynopsis"><p><code class="command">ddns-confgen</code>  [<code class="option">-a <em class="replaceable"><code>algorithm</code></em></code>] [<code class="option">-h</code>] [<code class="option">-k <em class="replaceable"><code>keyname</code></em></code>] [<code class="option">-r <em class="replaceable"><code>randomfile</code></em></code>] [<code class="option">-s</code>] [<code class="option">-q</code>] [name]</p></div>
+<div class="cmdsynopsis"><p><code class="command">ddns-confgen</code>  [<code class="option">-a <em class="replaceable"><code>algorithm</code></em></code>] [<code class="option">-h</code>] [<code class="option">-k <em class="replaceable"><code>keyname</code></em></code>] [<code class="option">-r <em class="replaceable"><code>randomfile</code></em></code>] [<code class="option">-s name | -z zone</code>] [<code class="option">-q</code>] [name]</p></div>
 </div>
 <div class="refsect1" lang="en">
 <a name="id2543377"></a><h2>DESCRIPTION</h2>
@@ -74,7 +74,12 @@
 <dt><span class="term">-k <em class="replaceable"><code>keyname</code></em></span></dt>
 <dd><p>
 	    Specifies the key name of the DDNS authentication key.
-	    The default is <code class="constant">ddns-key</code>.
+	    The default is <code class="constant">ddns-key</code> when neither
+	    the <span><strong class="command">-s</strong></span> nor <span><strong class="command">-z</strong></span> option is
+	    specified; otherwise, the default
+	    is <code class="constant">ddns-key</code> as a separate label
+	    followed by the argument of the option, e.g.,
+	    <code class="constant">ddns-key.example.com.</code>
 	    The key name must have the format of a valid domain name,
 	    consisting of letters, digits, hyphens and periods.
 	  </p></dd>
@@ -95,18 +100,30 @@
             <code class="filename">keyboard</code> indicates that keyboard input
             should be used.
 	  </p></dd>
-<dt><span class="term">-s</span></dt>
+<dt><span class="term">-s <em class="replaceable"><code>name</code></em></span></dt>
 <dd><p>
 	    Self mode:  The example <span><strong class="command">named.conf</strong></span> text
-            shows how to set an update policy using the "self" nametype,
-            using a single key per each domain name for updates, instead of
-            the "subdomain" nametype which allows matching on any name
-            within a specified domain.
+            shows how to set an update policy for the specified
+	    <em class="replaceable"><code>name</code></em>
+	    using the "self" nametype, instead of the "subdomain"
+	    nametype which allows matching on any name within a
+	    specified domain.
+	    This option cannot be used with the <span><strong class="command">-z</strong></span> option.
+	  </p></dd>
+<dt><span class="term">-z <em class="replaceable"><code>zone</code></em></span></dt>
+<dd><p>
+	    zone mode:  The example <span><strong class="command">named.conf</strong></span> text
+            shows how to set an update policy for the specified
+	    <em class="replaceable"><code>zone</code></em>
+	    using the "zonesub" nametype, allowing updates to all subdomain
+	    names within
+	    that <em class="replaceable"><code>zone</code></em>.
+	    This option cannot be used with the <span><strong class="command">-s</strong></span> option.
 	  </p></dd>
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543556"></a><h2>SEE ALSO</h2>
+<a name="id2543618"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">nsupdate</span>(1)</span>,
       <span class="citerefentry"><span class="refentrytitle">named.conf</span>(5)</span>,
       <span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
@@ -114,7 +131,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2543594"></a><h2>AUTHOR</h2>
+<a name="id2543656"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
diff --git a/doc/arm/man.ddns-confgen.html b/doc/arm/man.ddns-confgen.html
index d1f2ca9f6e..3b8b3ec25b 100644
--- a/doc/arm/man.ddns-confgen.html
+++ b/doc/arm/man.ddns-confgen.html
@@ -14,7 +14,7 @@
  - OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  - PERFORMANCE OF THIS SOFTWARE.
 -->
-<!-- $Id: man.ddns-confgen.html,v 1.4 2009/06/16 01:12:45 tbox Exp $ -->
+<!-- $Id: man.ddns-confgen.html,v 1.5 2009/06/17 01:12:48 tbox Exp $ -->
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -45,10 +45,10 @@
 </div>
 <div class="refsynopsisdiv">
 <h2>Synopsis</h2>
-<div class="cmdsynopsis"><p><code class="command">ddns-confgen</code>  [<code class="option">-a <em class="replaceable"><code>algorithm</code></em></code>] [<code class="option">-h</code>] [<code class="option">-k <em class="replaceable"><code>keyname</code></em></code>] [<code class="option">-r <em class="replaceable"><code>randomfile</code></em></code>] [<code class="option">-s</code>] [<code class="option">-q</code>] [name]</p></div>
+<div class="cmdsynopsis"><p><code class="command">ddns-confgen</code>  [<code class="option">-a <em class="replaceable"><code>algorithm</code></em></code>] [<code class="option">-h</code>] [<code class="option">-k <em class="replaceable"><code>keyname</code></em></code>] [<code class="option">-r <em class="replaceable"><code>randomfile</code></em></code>] [<code class="option">-s name | -z zone</code>] [<code class="option">-q</code>] [name]</p></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2609560"></a><h2>DESCRIPTION</h2>
+<a name="id2634550"></a><h2>DESCRIPTION</h2>
 <p><span><strong class="command">ddns-confgen</strong></span>
       generates a key for use by <span><strong class="command">nsupdate</strong></span>
       and <span><strong class="command">named</strong></span>.  It simplifies configuration
@@ -75,7 +75,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2634633"></a><h2>OPTIONS</h2>
+<a name="id2634637"></a><h2>OPTIONS</h2>
 <div class="variablelist"><dl>
 <dt><span class="term">-a <em class="replaceable"><code>algorithm</code></em></span></dt>
 <dd><p>
@@ -91,7 +91,12 @@
 <dt><span class="term">-k <em class="replaceable"><code>keyname</code></em></span></dt>
 <dd><p>
 	    Specifies the key name of the DDNS authentication key.
-	    The default is <code class="constant">ddns-key</code>.
+	    The default is <code class="constant">ddns-key</code> when neither
+	    the <span><strong class="command">-s</strong></span> nor <span><strong class="command">-z</strong></span> option is
+	    specified; otherwise, the default
+	    is <code class="constant">ddns-key</code> as a separate label
+	    followed by the argument of the option, e.g.,
+	    <code class="constant">ddns-key.example.com.</code>
 	    The key name must have the format of a valid domain name,
 	    consisting of letters, digits, hyphens and periods.
 	  </p></dd>
@@ -112,18 +117,30 @@
             <code class="filename">keyboard</code> indicates that keyboard input
             should be used.
 	  </p></dd>
-<dt><span class="term">-s</span></dt>
+<dt><span class="term">-s <em class="replaceable"><code>name</code></em></span></dt>
 <dd><p>
 	    Self mode:  The example <span><strong class="command">named.conf</strong></span> text
-            shows how to set an update policy using the "self" nametype,
-            using a single key per each domain name for updates, instead of
-            the "subdomain" nametype which allows matching on any name
-            within a specified domain.
+            shows how to set an update policy for the specified
+	    <em class="replaceable"><code>name</code></em>
+	    using the "self" nametype, instead of the "subdomain"
+	    nametype which allows matching on any name within a
+	    specified domain.
+	    This option cannot be used with the <span><strong class="command">-z</strong></span> option.
+	  </p></dd>
+<dt><span class="term">-z <em class="replaceable"><code>zone</code></em></span></dt>
+<dd><p>
+	    zone mode:  The example <span><strong class="command">named.conf</strong></span> text
+            shows how to set an update policy for the specified
+	    <em class="replaceable"><code>zone</code></em>
+	    using the "zonesub" nametype, allowing updates to all subdomain
+	    names within
+	    that <em class="replaceable"><code>zone</code></em>.
+	    This option cannot be used with the <span><strong class="command">-s</strong></span> option.
 	  </p></dd>
 </dl></div>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2634832"></a><h2>SEE ALSO</h2>
+<a name="id2634908"></a><h2>SEE ALSO</h2>
 <p><span class="citerefentry"><span class="refentrytitle">nsupdate</span>(1)</span>,
       <span class="citerefentry"><span class="refentrytitle">named.conf</span>(5)</span>,
       <span class="citerefentry"><span class="refentrytitle">named</span>(8)</span>,
@@ -131,7 +148,7 @@
     </p>
 </div>
 <div class="refsect1" lang="en">
-<a name="id2634870"></a><h2>AUTHOR</h2>
+<a name="id2634947"></a><h2>AUTHOR</h2>
 <p><span class="corpauthor">Internet Systems Consortium</span>
     </p>
 </div>
