Index: basicnet/netprogs/inetutils.xml
===================================================================
--- basicnet/netprogs/inetutils.xml	(revision 104ecdc753c79ebf424c80e14a099927aad013b3)
+++ basicnet/netprogs/inetutils.xml	(revision 00f2a08e4059a03a8a6b981a9de4a6f5800c5f7c)
@@ -89,7 +89,7 @@
 
 <para><option>--disable-whois</option>: This switch will prevent
-<application>Inetutils</application> installing a whois client, since the
-included whois client is out of date. Add this option if you plan on installing
-<xref linkend="whois"/>.</para>
+<application>Inetutils</application> installing an outdated 
+<command>whois</command> client. Add this option if you plan on installing 
+<xref linkend="whois-package"/>.</para>
 
 <para><option>--with-pam</option>: This switch makes 
Index: basicnet/netutils/whois.xml
===================================================================
--- basicnet/netutils/whois.xml	(revision 104ecdc753c79ebf424c80e14a099927aad013b3)
+++ basicnet/netutils/whois.xml	(revision 00f2a08e4059a03a8a6b981a9de4a6f5800c5f7c)
@@ -7,11 +7,11 @@
   <!ENTITY whois-download-http "http://ftp.debian.org/debian/pool/main/w/whois/whois_&whois-version;.tar.gz">
   <!ENTITY whois-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/slackware/slackware-current/source/n/whois/whois_&whois-version;.tar.gz">
-  <!ENTITY whois-md5sum        "1be817f83451588cdfa16be772c7e469">
-  <!ENTITY whois-size          "51 KB">
-  <!ENTITY whois-buildsize     "484 KB">
+  <!ENTITY whois-md5sum        "f9eb884328fc7e49a9751389e7d1de71">
+  <!ENTITY whois-size          "52 KB">
+  <!ENTITY whois-buildsize     "632 KB">
   <!ENTITY whois-time          "0.01 SBU">
 ]>
 
-<sect1 id="whois" xreflabel="Whois-&whois-version;">
+<sect1 id="whois-package" xreflabel="Whois-&whois-version;">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -20,4 +20,6 @@
 <?dbhtml filename="whois.html"?>
 <title>Whois-&whois-version;</title>
+<indexterm zone="whois-package">
+<primary sortas="a-whois-package">Whois</primary></indexterm>
 
 <sect2>
@@ -58,15 +60,24 @@
 <title>Contents</title>
 
-<para>The <application>Whois</application> package contains 
-<command>whois</command>.</para>
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<seglistitem>
+<seg>whois</seg>
+</seglistitem>
+</segmentedlist>
 
-</sect2>
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
 
-<sect2><title>Description</title>
-
-<sect3><title>whois</title>
-<para><command>whois</command> is a client-side application which queries the 
-whois directory service for information pertaining to a particular domain name.
-</para></sect3>
+<varlistentry id="whois">
+<term><command>whois</command></term>
+<listitem><para>is a client-side application which queries the whois directory 
+service for information pertaining to a particular domain name.</para>
+<indexterm zone="whois-package whois">
+<primary sortas="b-whois">whois</primary></indexterm>
+</listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
Index: general.ent
===================================================================
--- general.ent	(revision 104ecdc753c79ebf424c80e14a099927aad013b3)
+++ general.ent	(revision 00f2a08e4059a03a8a6b981a9de4a6f5800c5f7c)
@@ -225,5 +225,5 @@
 <!ENTITY traceroute-version           "1.4a12"> 
 <!ENTITY nmap-version                 "3.75">  
-<!ENTITY whois-version                "4.6.25">
+<!ENTITY whois-version                "4.6.26">
 <!ENTITY bind-version                 "9.3.0"> 
 <!ENTITY ethereal-version             "0.10.7"> 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 104ecdc753c79ebf424c80e14a099927aad013b3)
+++ introduction/welcome/changelog.xml	(revision 00f2a08e4059a03a8a6b981a9de4a6f5800c5f7c)
@@ -28,5 +28,5 @@
 <listitem><para>January 13th, 2005 [randy]: Shortened line lengths in various 
 package instructions to fit in the viewable area of a PDF version of the 
-book.</para></listitem>
+book; updated to Whois-4.6.26.</para></listitem>
 
 <listitem><para>January 12th, 2005 [igor]: Updated to
