diff --git a/CHANGES b/CHANGES
index 58f83ff8de..47089eba69 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2120.	[doc]		Fix markup on nsupdate man page. [RT #16556]
+
 2119.	[compat]	libbind: allow res_init() to succeed enough to
 			return the default domain even if it was unable
 			to allocate memory.
diff --git a/bin/dig/nslookup.docbook b/bin/dig/nslookup.docbook
index c17dcb7267..3d934bf158 100644
--- a/bin/dig/nslookup.docbook
+++ b/bin/dig/nslookup.docbook
@@ -17,7 +17,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: nslookup.docbook,v 1.10 2006/01/06 00:01:44 marka Exp $ -->
+<!-- $Id: nslookup.docbook,v 1.11 2006/12/16 01:14:36 sra Exp $ -->
 <!--
  - Copyright (c) 1985, 1989
  -    The Regents of the University of California.  All rights reserved.
@@ -141,7 +141,7 @@ nslookup -query=hinfo  -timeout=10
     <title>INTERACTIVE COMMANDS</title>
     <variablelist>
       <varlistentry>
-        <term>host <optional>server</optional></term>
+        <term><constant>host</constant> <optional>server</optional></term>
         <listitem>
           <para>
             Look up information for host using the current default server or
diff --git a/bin/nsupdate/nsupdate.docbook b/bin/nsupdate/nsupdate.docbook
index a3175fb3a9..1577896530 100644
--- a/bin/nsupdate/nsupdate.docbook
+++ b/bin/nsupdate/nsupdate.docbook
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- $Id: nsupdate.docbook,v 1.23 2006/01/27 23:57:46 marka Exp $ -->
+<!-- $Id: nsupdate.docbook,v 1.24 2006/12/16 01:14:36 sra Exp $ -->
 <refentry>
   <refentryinfo>
     <date>Jun 30, 2000</date>
@@ -220,11 +220,11 @@
       <variablelist>
 
         <varlistentry>
-          <term><cmdsynopsis>
+          <term>
               <command>server</command>
               <arg choice="req">servername</arg>
               <arg choice="opt">port</arg>
-            </cmdsynopsis></term>
+            </term>
           <listitem>
             <para>
               Sends all dynamic update requests to the name server
@@ -247,11 +247,11 @@
         </varlistentry>
 
         <varlistentry>
-          <term><cmdsynopsis>
+          <term>
               <command>local</command>
               <arg choice="req">address</arg>
               <arg choice="opt">port</arg>
-            </cmdsynopsis></term>
+            </term>
           <listitem>
             <para>
               Sends all dynamic update requests using the local
@@ -270,10 +270,10 @@
         </varlistentry>
 
         <varlistentry>
-          <term><cmdsynopsis>
+          <term>
               <command>zone</command>
               <arg choice="req">zonename</arg>
-            </cmdsynopsis></term>
+            </term>
           <listitem>
             <para>
               Specifies that all updates are to be made to the zone
@@ -289,10 +289,10 @@
         </varlistentry>
 
         <varlistentry>
-          <term><cmdsynopsis>
+          <term>
               <command>class</command>
               <arg choice="req">classname</arg>
-            </cmdsynopsis></term>
+            </term>
           <listitem>
             <para>
               Specify the default class.
@@ -304,11 +304,11 @@
         </varlistentry>
 
         <varlistentry>
-          <term><cmdsynopsis>
+          <term>
               <command>key</command>
               <arg choice="req">name</arg>
               <arg choice="req">secret</arg>
-            </cmdsynopsis></term>
+            </term>
           <listitem>
             <para>
               Specifies that all updates are to be TSIG signed using the
@@ -321,10 +321,10 @@
         </varlistentry>
 
         <varlistentry>
-          <term><cmdsynopsis>
+          <term>
               <command>prereq nxdomain</command>
               <arg choice="req">domain-name</arg>
-            </cmdsynopsis></term>
+            </term>
           <listitem>
             <para>
               Requires that no resource record of any type exists with name
@@ -335,10 +335,10 @@
 
 
         <varlistentry>
-          <term><cmdsynopsis>
+          <term>
               <command>prereq yxdomain</command>
               <arg choice="req">domain-name</arg>
-            </cmdsynopsis></term>
+            </term>
           <listitem>
             <para>
               Requires that
@@ -349,12 +349,12 @@
         </varlistentry>
 
         <varlistentry>
-          <term><cmdsynopsis>
+          <term>
               <command>prereq nxrrset</command>
               <arg choice="req">domain-name</arg>
               <arg choice="opt">class</arg>
               <arg choice="req">type</arg>
-            </cmdsynopsis></term>
+            </term>
           <listitem>
             <para>
               Requires that no resource record exists of the specified
@@ -371,12 +371,12 @@
 
 
         <varlistentry>
-          <term><cmdsynopsis>
+          <term>
               <command>prereq yxrrset</command>
               <arg choice="req">domain-name</arg>
               <arg choice="opt">class</arg>
               <arg choice="req">type</arg>
-            </cmdsynopsis></term>
+            </term>
           <listitem>
             <para>
               This requires that a resource record of the specified
@@ -393,13 +393,13 @@
         </varlistentry>
 
         <varlistentry>
-          <term><cmdsynopsis>
+          <term>
               <command>prereq yxrrset</command>
               <arg choice="req">domain-name</arg>
               <arg choice="opt">class</arg>
               <arg choice="req">type</arg>
               <arg choice="req" rep="repeat">data</arg>
-            </cmdsynopsis></term>
+            </term>
           <listitem>
             <para>
               The
@@ -427,13 +427,13 @@
         </varlistentry>
 
         <varlistentry>
-          <term><cmdsynopsis>
+          <term>
               <command>update delete</command>
               <arg choice="req">domain-name</arg>
               <arg choice="opt">ttl</arg>
               <arg choice="opt">class</arg>
               <arg choice="opt">type <arg choice="opt" rep="repeat">data</arg></arg>
-            </cmdsynopsis></term>
+            </term>
           <listitem>
             <para>
               Deletes any resource records named
@@ -453,14 +453,14 @@
         </varlistentry>
 
         <varlistentry>
-          <term><cmdsynopsis>
+          <term>
               <command>update add</command>
               <arg choice="req">domain-name</arg>
               <arg choice="req">ttl</arg>
               <arg choice="opt">class</arg>
               <arg choice="req">type</arg>
               <arg choice="req" rep="repeat">data</arg>
-            </cmdsynopsis></term>
+            </term>
           <listitem>
             <para>
               Adds a new resource record with the specified
@@ -473,9 +473,9 @@
         </varlistentry>
 
         <varlistentry>
-          <term><cmdsynopsis>
+          <term>
               <command>show</command>
-            </cmdsynopsis></term>
+            </term>
           <listitem>
             <para>
               Displays the current message, containing all of the
@@ -486,9 +486,9 @@
         </varlistentry>
 
         <varlistentry>
-          <term><cmdsynopsis>
+          <term>
               <command>send</command>
-            </cmdsynopsis></term>
+            </term>
           <listitem>
             <para>
               Sends the current message.  This is equivalent to entering a
@@ -498,9 +498,9 @@
         </varlistentry>
 
         <varlistentry>
-          <term><cmdsynopsis>
+          <term>
               <command>answer</command>
-            </cmdsynopsis></term>
+            </term>
           <listitem>
             <para>
               Displays the answer.