Index: general.ent
===================================================================
--- general.ent	(revision 2f6f8294f3d89bcd25c9ce0a4a7456aeb3ac76c2)
+++ general.ent	(revision d9800161a855eef691cfc3b539ddfd35412a83c5)
@@ -1,7 +1,7 @@
-<!ENTITY day          "21">
+<!ENTITY day          "22">
 <!ENTITY month        "01">
 <!ENTITY year         "2005">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "January &day;st, &year;">
+<!ENTITY releasedate  "January &day;nd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "cvs">                  <!-- cvs|[release #] -->
Index: general/genlib/popt.xml
===================================================================
--- general/genlib/popt.xml	(revision 2f6f8294f3d89bcd25c9ce0a4a7456aeb3ac76c2)
+++ general/genlib/popt.xml	(revision d9800161a855eef691cfc3b539ddfd35412a83c5)
@@ -5,12 +5,12 @@
   %general-entities;
 
-<!ENTITY popt-download-http "http://gd.tuwien.ac.at/utils/rpm.org/dist/rpm-4.1.x/popt-&popt-version;.tar.gz">
-<!ENTITY popt-download-ftp "ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-&popt-version;.tar.gz">
-<!ENTITY popt-size "564 KB">
+<!ENTITY popt-download-http "http://ftp.debian.org/debian/pool/main/p/popt/popt_1.7.orig.tar.gz">
+<!ENTITY popt-download-ftp "ftp://ftp://ftp.debian.org/debian/pool/main/p/popt/popt_1.7.orig.tar.gz">
+<!ENTITY popt-size "562 KB">
 <!ENTITY popt-buildsize "17.4 MB">
 <!ENTITY popt-time "0.06 SBU">
 ]>
 
-<sect1 id="popt" xreflabel="popt-&popt-version;">
+<sect1 id="popt" xreflabel="popt-&popt-version;-5">
 <sect1info>
 <othername>$LastChangedBy$</othername>
@@ -18,5 +18,7 @@
 </sect1info>
 <?dbhtml filename="popt.html"?>
-<title><application>popt</application>-&popt-version;</title>
+<title><application>popt</application>-&popt-version;-5</title>
+<indexterm zone="popt">
+<primary sortas="a-popt">Popt</primary></indexterm>
 
 <sect2>
@@ -40,4 +42,11 @@
 </sect3>
 
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Patch level upgrade: <ulink
+url="http://ftp.debian.org/debian/pool/main/p/popt/popt_&popt-version;-5.diff.gz"/></para></listitem>
+</itemizedlist>
+</sect3>
+
 </sect2>
 
@@ -48,5 +57,8 @@
 commands:</para>
 
-<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+<screen><userinput><command>patch -Np1 -i ../popt_&popt-version;-5.diff &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
+cp configure.in configure.ac &amp;&amp;
+touch configure.in configure.ac &amp;&amp;
 make &amp;&amp;
 make install</command></userinput></screen>
@@ -55,16 +67,41 @@
 
 <sect2>
+<title>Command explanations</title>
+ 
+<para><command>cp configure.in configure.ac</command>:
+Because we updated <filename>configure.in</filename> with the patch,
+we need to create this file for configure to work properly.</para>
+ 
+<para><command>touch configure.in configure.ac</command>:
+Ensure file timestamps are the same.</para>
+ 
+</sect2>
+
+<sect2>
 <title>Contents</title>
 
-<para>The <application>popt</application> package contains the
-<filename class="libraryfile">libpopt</filename> libraries.</para>
+<segmentedlist>
+<!-- <segtitle>Installed Program</segtitle> -->
+<segtitle>Installed Library</segtitle>
+<!-- <segtitle>Installed Directories</segtitle> -->
+<seglistitem>
+<!-- <seg>tclsh</seg> -->
+<seg>libpopt</seg>
+<!-- <seg>/usr/lib/tcl8.4 and /usr/include/tcl8.4</seg> -->
+</seglistitem>
+</segmentedlist>
 
-</sect2>
+<variablelist>
+<bridgehead renderas="sect3">Short Descriptions</bridgehead>
+<?dbfo list-presentation="list"?>
 
-<sect2><title>Description</title>
-
-<sect3><title>popt library</title>
-<para>The <filename class="libraryfile">libpopt</filename> library is used to
-parse command-line options.</para></sect3>
+<varlistentry id="libpopt">
+<term><filename role='library'>libpopt.so</filename></term>
+<listitem><para> is used to parse command-line options.</para>
+<indexterm zone="popt libpopt">
+<primary sortas="c-libpopt">libpopt</primary></indexterm>
+</listitem>
+</varlistentry>
+</variablelist>
 
 </sect2>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 2f6f8294f3d89bcd25c9ce0a4a7456aeb3ac76c2)
+++ introduction/welcome/changelog.xml	(revision d9800161a855eef691cfc3b539ddfd35412a83c5)
@@ -22,4 +22,7 @@
 
 <itemizedlist>
+
+<listitem><para>January 22nd, 2005 [bdubbs]: Updated to libpopt-1.7-5
+and uodated download locations.</para></listitem>
 
 <listitem><para>January 20th, 2005 [randy]: Updated to MPlayer-1.0pre6a, 
