Index: general.ent
===================================================================
--- general.ent	(revision 460a9927eca93aa57e937bf9ab8b3f62e83edc8b)
+++ general.ent	(revision d17e3553eb40ac4acd0c5be2780e53a7148a1e3d)
@@ -246,5 +246,5 @@
 <!ENTITY pciutils-version             "3.1.7">
 <!ENTITY usbutils-version             "0.86">
-<!ENTITY cpio-version                 "2.9">
+<!ENTITY cpio-version                 "2.11">
 <!ENTITY mc-version                   "4.6.1">
 <!ENTITY sysstat-version              "9.0.6">
Index: general/sysutils/cpio.xml
===================================================================
--- general/sysutils/cpio.xml	(revision 460a9927eca93aa57e937bf9ab8b3f62e83edc8b)
+++ general/sysutils/cpio.xml	(revision d17e3553eb40ac4acd0c5be2780e53a7148a1e3d)
@@ -7,8 +7,8 @@
   <!ENTITY cpio-download-http "http://ftp.gnu.org/pub/gnu/cpio/cpio-&cpio-version;.tar.bz2">
   <!ENTITY cpio-download-ftp  "ftp://ftp.gnu.org/pub/gnu/cpio/cpio-&cpio-version;.tar.bz2">
-  <!ENTITY cpio-md5sum        "e387abfdae3a0b9a8a5f762db653a96d">
-  <!ENTITY cpio-size          "758 KB">
-  <!ENTITY cpio-buildsize     "10 MB">
-  <!ENTITY cpio-time          "0.2 SBU">
+  <!ENTITY cpio-md5sum        "20fc912915c629e809f80b96b2e75d7d">
+  <!ENTITY cpio-size          "1 MB">
+  <!ENTITY cpio-buildsize     "13 MB">
+  <!ENTITY cpio-time          "0.3 SBU">
 ]>
 
@@ -55,5 +55,5 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <!-- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -61,5 +61,5 @@
         url="&patch-root;/cpio-&cpio-version;-gcc43_inline-1.patch"/></para>
       </listitem>
-    </itemizedlist>
+    </itemizedlist> -->
 
     <para condition="html" role="usernotes">User Notes:
@@ -74,20 +74,20 @@
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../cpio-&cpio-version;-gcc43_inline-1.patch &amp;&amp;
-./configure CPIO_MT_PROG=mt \
-            --prefix=/usr \
-            --bindir=/bin \
+<screen><userinput>./configure --prefix=/usr     \
+            --bindir=/bin     \
             --libexecdir=/tmp \
+            --enable-mt       \
             --with-rmt=/usr/sbin/rmt &amp;&amp;
-make</userinput></screen>
+make &amp;&amp;
+makeinfo --html            -o doc/html      doc/cpio.texi &amp;&amp;
+makeinfo --html --no-split -o doc/cpio.html doc/cpio.texi &amp;&amp;
+makeinfo --plaintext       -o doc/cpio.txt  doc/cpio.texi</userinput></screen>
 
     <para>If you have <xref linkend="tetex"/> installed and wish to create
-    alternate forms of the documentation, issue the any or all of the following
+    PDF or Postscript documentation, issue one or both of the following
     commands:</para>
 
 <screen><userinput>make -C doc pdf &amp;&amp;
-make -C doc ps &amp;&amp;
-texi2html -o doc/cpio.html doc/cpio.texi &amp;&amp;
-makeinfo --plaintext -o doc/cpio.txt doc/cpio.texi</userinput></screen>
+make -C doc ps</userinput></screen>
 
     <para>To test the results, issue <command>make check</command></para>
@@ -95,12 +95,16 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen role="root"><userinput>make install &amp;&amp;
+install -v -m755 -d /usr/share/doc/cpio-&cpio-version;/html &amp;&amp;
+install -v -m644    doc/html/* \
+                    /usr/share/doc/cpio-&cpio-version;/html &amp;&amp;
+install -v -m644    doc/cpio.{html,txt} \
+                    /usr/share/doc/cpio-&cpio-version;</userinput></screen>
 
-    <para>If you built any of the alternate forms of documentation, install it
+    <para>If you built PDF or Postscript documentation, install it
     by issuing the following commands as the
     <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>install -v -m755 -d /usr/share/doc/cpio-&cpio-version; &amp;&amp;
-install -v -m644 doc/cpio.{pdf,ps,dvi,html,txt} \
+<screen role="root"><userinput>install -v -m644 doc/cpio.{pdf,ps,dvi} \
                  /usr/share/doc/cpio-&cpio-version;</userinput></screen>
 
@@ -109,7 +113,4 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <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
@@ -121,4 +122,7 @@
     that <filename class='directory'>/usr/libexec</filename> is not
     created.</para>
+
+    <para><parameter>--enable-mt</parameter>: This parameter forces the
+    building and installation of the <command>mt</command> program.</para>
 
     <para><parameter>--with-rmt=/usr/sbin/rmt</parameter>: This parameter
@@ -139,5 +143,5 @@
         <seg>cpio and mt</seg>
         <seg>None</seg>
-        <seg>None</seg>
+        <seg>/usr/share/doc/cpio-&cpio-version;</seg>
       </seglistitem>
     </segmentedlist>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 460a9927eca93aa57e937bf9ab8b3f62e83edc8b)
+++ introduction/welcome/changelog.xml	(revision d17e3553eb40ac4acd0c5be2780e53a7148a1e3d)
@@ -46,4 +46,7 @@
       <itemizedlist>
         <listitem>
+          <para>[randy] - Updated to cpio-2.11.</para>
+        </listitem>
+        <listitem>
           <para>[randy] - Changed the SQLite package from optional to required
           in the Subversion instructions.</para>
