Index: general.ent
===================================================================
--- general.ent	(revision fb6fb185b6db2fb16650c128c0dbf045fdab8e85)
+++ general.ent	(revision 0882c902c22f12d61fdd425caceef6bb16ec4b33)
@@ -124,5 +124,5 @@
 <!ENTITY pciutils-version             "2.1.11">
 <!ENTITY pkgconfig-version            "0.15.0">
-<!ENTITY cpio-version                 "2.5">
+<!ENTITY cpio-version                 "2.6">
 <!ENTITY mc-version                   "4.6.0">
 <!ENTITY sysstat-version              "5.0.6">
Index: general/sysutils/cpio.xml
===================================================================
--- general/sysutils/cpio.xml	(revision fb6fb185b6db2fb16650c128c0dbf045fdab8e85)
+++ general/sysutils/cpio.xml	(revision 0882c902c22f12d61fdd425caceef6bb16ec4b33)
@@ -7,8 +7,7 @@
 <!ENTITY cpio-download-http "http://ftp.gnu.org/pub/gnu/cpio/cpio-&cpio-version;.tar.gz">
 <!ENTITY cpio-download-ftp "ftp://ftp.gnu.org/pub/gnu/cpio/cpio-&cpio-version;.tar.gz">
-<!ENTITY cpio-size "188 KB">
-<!ENTITY cpio-buildsize "1 MB">
-<!ENTITY cpio-time "0.06 SBU">
-
+<!ENTITY cpio-size "448 KB">
+<!ENTITY cpio-buildsize "5.4 MB">
+<!ENTITY cpio-time "0.12 SBU">
 ]>
 
@@ -23,9 +22,8 @@
 <sect2>
 <title>Introduction to <application>cpio</application></title>
-                                                                               
-                                                                               
+
 <para>The <application>cpio</application> package contains
 tools for archiving.</para>
-                                                                               
+
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
@@ -35,63 +33,67 @@
 url="&cpio-download-ftp;"/></para></listitem>
 <listitem><para>Download size: &cpio-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
+<listitem><para>Estimated disk space required:
 &cpio-buildsize;</para></listitem>
 <listitem><para>Estimated build time:
 &cpio-time;</para></listitem></itemizedlist>
 </sect3>
-                                                                               
-                                                                               
+
 </sect2>
 
 <sect2>
 <title>Installation of <application>cpio</application></title>
-                                                                               
+
 <para>Install <application>cpio</application> by running the following commands:
 </para>
-                                                                               
-<screen><userinput><command>./configure --prefix=/usr --libexecdir=/tmp/cpio \
-    --bindir=/bin &amp;&amp;
+
+<screen><userinput><command>sed -i -e "s/invalid_arg/argmatch_invalid/" src/mt.c &amp;&amp;
+./configure CPIO_MT_PROG=mt --prefix=/usr \
+    --bindir=/bin --libexecdir=/tmp \
+    --with-rmt=/usr/sbin/rmt &amp;&amp;
 make &amp;&amp;
-make install &amp;&amp;
-rm -rf /tmp/cpio</command></userinput></screen>
-                                                                               
+make install</command></userinput></screen>
+
 </sect2>
 
 <sect2>
 <title>Command explanations</title>
-                                                                               
-<para><parameter>--libexec=/tmp/cpio</parameter>: This command installs
-<command>rmt</command> to <filename class="directory">/tmp/cpio</filename> so
-that it can be removed. The <command>rmt</command> executable is already
-installed by the <application>tar</application> package in
-<acronym>LFS</acronym>.</para>
-                                                                               
-<para><parameter>--bindir=/bin</parameter>: This command installs
-<command>cpio</command> to <filename class="directory">/bin</filename> instead
-of <filename class="directory">/usr/bin</filename> as per
+
+<para><command>sed -i -e "s/invalid_arg/argmatch_invalid/" src/mt.c</command>: 
+This command fixes a build problem in the <command>mt</command> program.</para>
+
+<para><parameter>CPIO_MT_PROG=mt</parameter>: This parameter forces the 
+building and installation of the <command>mt</command> program.</para>
+
+<para><parameter>--bindir=/bin</parameter>: This parameter installs 
+<command>cpio</command> to <filename class="directory">/bin</filename> instead 
+of <filename class="directory">/usr/bin</filename> as per 
 <acronym>FHS</acronym> guidelines.</para>
-                                                                               
+
+<para><parameter>--libexecdir=/tmp</parameter>: This parameter is used so 
+that <filename class='directory'>/usr/libexec</filename> is not created.</para>
+
+<para><parameter>--with-rmt=/usr/sbin/rmt</parameter>: This parameter inhibits 
+building the <command>rmt</command> program as it is already installed by the 
+<application>tar</application> package in <acronym>LFS</acronym>.</para>
+
 </sect2>
 
 <sect2>
 <title>Contents</title>
-                                                                               
-<para>The <application>cpio</application> package contains <command>cpio
-</command> and <command>mt</command>.</para>
-                                                                               
+
+<para>The <application>cpio</application> package contains 
+<command>cpio</command> and <command>mt</command>.</para>
+
 </sect2>
-                                                                               
+
 <sect2><title>Description</title>
-                                                                               
+
 <sect3><title>cpio</title>
-<para><command>cpio</command> copies files to and from archives.</para></sect3>                                                                               
+<para><command>cpio</command> copies files to and from archives.</para></sect3>
+
 <sect3><title>mt</title>
-<para><command>mt</command> controls magnetic tape drive operations.</para></sect3>
-                                                                               
-<!--
-<sect3><title>rmt</title>
-<para><command>rmt</command> controls remote magnetic tape drive operations.</para></sect3>
--->
-                                                                               
+<para><command>mt</command> controls magnetic tape drive 
+operations.</para></sect3>
+
 </sect2>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision fb6fb185b6db2fb16650c128c0dbf045fdab8e85)
+++ introduction/welcome/changelog.xml	(revision 0882c902c22f12d61fdd425caceef6bb16ec4b33)
@@ -23,6 +23,6 @@
 <itemizedlist>
 
-<listitem><para>December 21st, 2004 [randy]: Updated to
-KOffice-1.3.5.</para></listitem>
+<listitem><para>December 21st, 2004 [randy]: Updated to KOffice-1.3.5 and 
+cpio-2.6.</para></listitem>
 
 <listitem><para>December 20th, 2004 [bdubbs]: Updated license of book to
