Index: general.ent
===================================================================
--- general.ent	(revision 85498e6fef798a5a951946d094e9f16d9aeb8823)
+++ general.ent	(revision 2ee0a026fcd66d75381a2669e29a431c0c8edf11)
@@ -56,5 +56,5 @@
 <!ENTITY iptables-version             "1.3.3">
 <!ENTITY gnupg-version                "1.4.3">
-<!ENTITY tripwire-version             "portable-0.9">
+<!ENTITY tripwire-version             "2.4.0.1">
 <!ENTITY heimdal-version              "0.7.2">
 <!ENTITY mitkrb-version               "1.4.1">
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 85498e6fef798a5a951946d094e9f16d9aeb8823)
+++ introduction/welcome/changelog.xml	(revision 2ee0a026fcd66d75381a2669e29a431c0c8edf11)
@@ -46,4 +46,7 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Updated to tripwire-2.4.0.1.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Updated to Whois-4.7.13.</para>
         </listitem>
Index: postlfs/security/tripwire.xml
===================================================================
--- postlfs/security/tripwire.xml	(revision 85498e6fef798a5a951946d094e9f16d9aeb8823)
+++ postlfs/security/tripwire.xml	(revision 2ee0a026fcd66d75381a2669e29a431c0c8edf11)
@@ -5,13 +5,13 @@
   %general-entities;
 
-  <!ENTITY tripwire-download-http "http://www.frenchfries.net/paul/tripwire/tripwire-&tripwire-version;.tar.gz">
+  <!ENTITY tripwire-download-http "http://prdownloads.sourceforge.net/tripwire/tripwire-&tripwire-version;-src.tar.bz2?download">
   <!ENTITY tripwire-download-ftp  " ">
-  <!ENTITY tripwire-md5sum        "02610d0593fe04d35d809ff6c5becc02">
-  <!ENTITY tripwire-size          "869 KB">
-  <!ENTITY tripwire-buildsize     "22 MB">
-  <!ENTITY tripwire-time          "2.96 SBU">
+  <!ENTITY tripwire-md5sum        "b371f79ac23cacc9ad40b1da76b4a0c4">
+  <!ENTITY tripwire-size          "1.2 MB">
+  <!ENTITY tripwire-buildsize     "37 MB">
+  <!ENTITY tripwire-time          "1.6 SBU">
 ]>
 
-<sect1 id="tripwire-portable" xreflabel="Tripwire-&tripwire-version;">
+<sect1 id="tripwire" xreflabel="Tripwire-&tripwire-version;">
   <?dbhtml filename="tripwire.html"?>
 
@@ -27,5 +27,5 @@
   <title>Tripwire-&tripwire-version;</title>
 
-  <indexterm zone="tripwire-portable">
+  <indexterm zone="tripwire">
     <primary sortas="a-Tripwire">Tripwire</primary>
   </indexterm>
@@ -59,4 +59,13 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Required patch:
+          <ulink url="&patch-root;/tripwire/tripwire-&tripwire-version;-gcc4_build_fixes-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+                                                       
     <bridgehead renderas="sect3">Tripwire Dependencies</bridgehead>
 
@@ -75,8 +84,15 @@
     commands:</para>
 
-<screen><userinput>sed -i -e 's@TWDB="${prefix}@TWDB="/var@' install/install.cfg &amp;&amp;
+<screen><userinput>ln -s contrib install &amp;&amp;
+patch -Np1 -i ../tripwire-&tripwire-version;-gcc4_build_fixes-1.patch &amp;&amp;
+sed -i -e 's@TWDB="${prefix}@TWDB="/var@' install/install.cfg &amp;&amp;
 ./configure --prefix=/usr --sysconfdir=/etc/tripwire &amp;&amp;
 make</userinput></screen>
 
+    <warning><para>The default configuration is to use a local MTA. If
+    you don't have an MTA installed and have no wish to install
+    one, modify <filename>install/install.cfg</filename> to use an SMTP
+    server instead.  Otherwise the install will fail.</para></warning>
+ 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
@@ -84,13 +100,11 @@
 cp -v policy/*.txt /usr/share/doc/tripwire</userinput></screen>
 
-    <para>The default configuration is to use a local MTA. If
-    you don't have an MTA installed and have no wish to install
-    one, modify <filename>install.cfg</filename> to use an SMTP
-    server instead.</para>
-
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
+
+    <para><command>ln -s contrib install</command>: This command creates 
+    a symbolic link in the build directory needed for installation.</para>
 
     <para><command>sed -i -e 's@TWDB="${prefix}@TWDB="/var@'
@@ -117,5 +131,5 @@
       <para><filename>/etc/tripwire/*</filename></para>
 
-      <indexterm zone="tripwire-portable tripwire-config">
+      <indexterm zone="tripwire tripwire-config">
         <primary sortas="e-etc-tripwire">/etc/tripwire/*</primary>
       </indexterm>
@@ -200,4 +214,8 @@
       <command>:x</command>.</para>
 
+      
+      <para>A good summary of tripwire operations can be found at       
+      <ulink url="http://www.redhat.com/docs/manuals/linux/RHL-9-Manual/ref-guide/ch-tripwire.html"/>.</para>
+
     </sect3>
 
@@ -241,5 +259,5 @@
           <para>is a signature gathering utility that displays
           the hash function values for the specified files.</para>
-          <indexterm zone="tripwire-portable siggen">
+          <indexterm zone="tripwire siggen">
             <primary sortas="b-siggen">siggen</primary>
           </indexterm>
@@ -247,9 +265,9 @@
       </varlistentry>
 
-      <varlistentry id='tripwire'>
+      <varlistentry id='tripwire-program'>
         <term><command>tripwire</command></term>
         <listitem>
           <para>is the main file integrity checking program.</para>
-          <indexterm zone="tripwire-portable tripwire">
+          <indexterm zone="tripwire tripwire">
             <primary sortas="b-tripwire">tripwire</primary>
           </indexterm>
@@ -264,5 +282,5 @@
           <application>Tripwire</application> files and configuration
           options.</para>
-          <indexterm zone="tripwire-portable twadmin">
+          <indexterm zone="tripwire twadmin">
             <primary sortas="b-twadmin">twadmin</primary>
           </indexterm>
@@ -275,5 +293,5 @@
           <para>prints <application>Tripwire</application>
           database and report files in clear text format.</para>
-          <indexterm zone="tripwire-portable twprint">
+          <indexterm zone="tripwire twprint">
             <primary sortas="b-twprint">twprint</primary>
           </indexterm>
