Index: general.ent
===================================================================
--- general.ent	(revision 9f52578de16b8bb969d29b226af87b5b8910efec)
+++ general.ent	(revision 4be620424e3d578c0a8fbb0d18f6204a2301bdd2)
@@ -122,5 +122,5 @@
 <!ENTITY which-version                "2.16">
 <!ENTITY unzip-version                "5.51">
-<!ENTITY zip-version                  "2.3">
+<!ENTITY zip-version                  "2.31">
 <!ENTITY pciutils-version             "2.1.11">
 <!ENTITY pkgconfig-version            "0.15.0">
Index: general/sysutils/zip.xml
===================================================================
--- general/sysutils/zip.xml	(revision 9f52578de16b8bb969d29b226af87b5b8910efec)
+++ general/sysutils/zip.xml	(revision 4be620424e3d578c0a8fbb0d18f6204a2301bdd2)
@@ -5,10 +5,10 @@
   %general-entities;
 
-<!ENTITY zip-download-http "http://www.mirrorservice.org/sites/ftp.info-zip.org/pub/infozip/src/zip23.tar.gz">
-<!ENTITY zip-download-ftp "ftp://ftp.info-zip.org/pub/infozip/src/zip23.tar.gz">
-<!ENTITY zip-md5sum "5206a99541f3b0ab90f1baa167392c4f">
-<!ENTITY zip-size "839 KB">
-<!ENTITY zip-buildsize "3.6 MB">
-<!ENTITY zip-time "0.05 SBU">
+<!ENTITY zip-download-http "http://www.mirrorservice.org/sites/ftp.info-zip.org/pub/infozip/src/zip231.tar.gz">
+<!ENTITY zip-download-ftp "ftp://ftp.info-zip.org/pub/infozip/src/zip231.tar.gz">
+<!ENTITY zip-md5sum "6bfc076664416251d7624ab3538d1cb9">
+<!ENTITY zip-size "781 KB">
+<!ENTITY zip-buildsize "4.1 MB">
+<!ENTITY zip-time "0.04 SBU">
 ]>
 
@@ -20,4 +20,6 @@
 <?dbhtml filename="zip.html"?>
 <title>Zip-&zip-version;</title>
+<indexterm zone="zip">
+<primary sortas="a-Zip">Zip</primary></indexterm>
 
 <sect2>
@@ -50,6 +52,11 @@
 commands:</para>
 
-<screen><userinput><command>make prefix=/usr -f unix/Makefile generic_gcc &amp;&amp;
-make prefix=/usr -f unix/Makefile install</command></userinput></screen>
+<screen><userinput><command>sed -i -e 's@$(INSTALL) man/zip.1@$(INSTALL_PROGRAM) man/zip.1@' \
+    unix/Makefile &amp;&amp;
+make prefix=/usr -f unix/Makefile generic_gcc</command></userinput></screen>
+
+<para>Now, as the root user:</para>
+
+<screen><userinput role='root'><command>make prefix=/usr -f unix/Makefile install</command></userinput></screen>
 
 </sect2>
@@ -71,29 +78,58 @@
 <title>Contents</title>
 
-<para>The <application>Zip</application> package contains 
-<command>zip</command>, <command>zipcloak</command>, 
-<command>zipnote</command> and <command>zipsplit</command>.</para>
+<segmentedlist>
+<segtitle>Installed Programs</segtitle>
+<segtitle>Installed Libraries</segtitle>
+<segtitle>Installed Directories</segtitle>
 
-</sect2>
+<seglistitem>
+<seg>zip, zipcloak, zipnote, zipsplit</seg>
+<seg>None</seg>
+<seg>None</seg>
+</seglistitem>
+</segmentedlist>
 
-<sect2><title>Description</title>
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
 
-<sect3><title>zip</title>
-<para><command>zip</command> compresses files into a
-<filename>ZIP</filename> archive.</para></sect3>
+<varlistentry id="zip-prog">
+<term><command>zip</command></term>
+<listitem><para>compresses files into a <filename>ZIP</filename> 
+archive.</para>
+<indexterm zone="zip zip-prog">
+<primary sortas="b-zip">zip</primary>
+</indexterm></listitem>
+</varlistentry>
 
-<sect3><title>zipcloak</title>
-<para><command>zipcloak</command> is disabled in this version of
-<application>Zip</application>.  It will
-display a message about how to support encryption by recompiling with
-<filename>zcrypt27.zip</filename>.</para></sect3>
+<varlistentry id="zipcloak">
+<term><command>zipcloak</command></term>
+<listitem><para>is disabled in this version of <application>Zip</application>. 
+It will display a message about how to support encryption by recompiling with 
+<filename>zcrypt27.zip</filename>.</para>
+<indexterm zone="zip zipcloak">
+<primary sortas="b-zipcloak">zipcloak</primary>
+</indexterm></listitem>
+</varlistentry>
 
-<sect3><title>zipnote</title>
-<para><command>zipnote</command> reads or writes comments stored in a
-<filename>ZIP</filename> file.</para></sect3>
+<varlistentry id="zipnote">
+<term><command>zipnote</command></term>
+<listitem><para>reads or writes comments stored in a <filename>ZIP</filename> 
+file.</para>
+<indexterm zone="zip zipnote">
+<primary sortas="b-zipnote">zipnote</primary>
+</indexterm></listitem>
+</varlistentry>
 
-<sect3><title>zipsplit</title>
-<para><command>zipsplit</command> is a utility to split
-<filename>ZIP</filename> files into smaller files.</para></sect3>
+<varlistentry id="zipsplit">
+<term><command>zipsplit</command></term>
+<listitem><para>is a utility to split <filename>ZIP</filename> files into 
+smaller files.</para>
+<indexterm zone="zip zipsplit">
+<primary sortas="b-zipsplit">zipsplit</primary>
+</indexterm></listitem>
+</varlistentry>
+
+</variablelist>
 
 </sect2>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 9f52578de16b8bb969d29b226af87b5b8910efec)
+++ introduction/welcome/changelog.xml	(revision 4be620424e3d578c0a8fbb0d18f6204a2301bdd2)
@@ -24,5 +24,6 @@
 
 <listitem><para>March 17th, 2005 [randy]: Changed cracklib from a required 
-dependency to recommended in the Linux-Pam instructions.</para></listitem>
+dependency to recommended in the Linux-Pam instructions; updated to 
+Zip-2.31.</para></listitem>
 
 <listitem><para>March 16th, 2005 [igor]: Updated to
