Index: BOOK/final-system/sparc64/binutils.xml
===================================================================
--- BOOK/final-system/sparc64/binutils.xml	(revision 9e7b1379a6032b7bec70e494c998e4739b11cb47)
+++ BOOK/final-system/sparc64/binutils.xml	(revision 5bd60e2df02cbeb92610cc0edf797a64c3b06802)
@@ -42,10 +42,11 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para os="aa">The following patch makes Binutils search in both the
-    <filename class="directory">lib</filename> and <filename
-    class="directory">lib64</filename> directories in a multilib
-    environment:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/binutils.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
 
-<screen os="ab"><userinput>patch -Np1 -i ../&binutils-multilib-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/binutils.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/general.ent
===================================================================
--- BOOK/general.ent	(revision 9e7b1379a6032b7bec70e494c998e4739b11cb47)
+++ BOOK/general.ent	(revision 5bd60e2df02cbeb92610cc0edf797a64c3b06802)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY version "CLFS-SVN-20051119">
+<!ENTITY version "CLFS-SVN-20051120">
 <!ENTITY version-x86 "&version;-x86">
 <!ENTITY version-x86_64 "&version;-x86_64-Multilib">
@@ -14,5 +14,5 @@
 <!ENTITY version-alpha "&version;-ALPHA">
 
-<!ENTITY releasedate "November 19, 2005">
+<!ENTITY releasedate "November 20, 2005">
 <!ENTITY milestone "0.1">
 <!ENTITY generic-version "svn"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->
Index: BOOK/materials/alpha/patches.xml
===================================================================
--- BOOK/materials/alpha/patches.xml	(revision 9e7b1379a6032b7bec70e494c998e4739b11cb47)
+++ BOOK/materials/alpha/patches.xml	(revision 5bd60e2df02cbeb92610cc0edf797a64c3b06802)
@@ -21,11 +21,7 @@
     </varlistentry>
 
-    <varlistentry>
-      <term>GCC Specs Patch - 14 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;gcc/&gcc-specs-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/patches.xml"
+    xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
   </variablelist>
Index: BOOK/materials/mips/patches.xml
===================================================================
--- BOOK/materials/mips/patches.xml	(revision 9e7b1379a6032b7bec70e494c998e4739b11cb47)
+++ BOOK/materials/mips/patches.xml	(revision 5bd60e2df02cbeb92610cc0edf797a64c3b06802)
@@ -13,5 +13,5 @@
   <variablelist role="materials">
 
-    <varlistentry>
+    <varlistentry os="file-mips_update-patch">
       <term>File Config Update Patch - 35 KB:</term>
       <listitem>
@@ -21,5 +21,5 @@
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry os="flex-mips_update-patch">
       <term>Flex Config Update Patch - 33 KB:</term>
       <listitem>
@@ -29,13 +29,9 @@
     </varlistentry>
 
-    <varlistentry>
-      <term>GCC Specs Patch - 14 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;gcc/&gcc-specs-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/patches.xml"
+    xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
-    <varlistentry>
+    <varlistentry os="gcc-mips_tls-patch">
       <term>GCC MIPS TLS Patch - 16 KB:</term>
       <listitem>
@@ -45,5 +41,5 @@
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry os="glibc-mips_nptl-patch">
       <term>Glibc MIPS NPTL Patch - 34 KB:</term>
       <listitem>
@@ -53,5 +49,5 @@
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry os="grep-mips_update-patch">
       <term>Grep Config Update Patch - 48 KB:</term>
       <listitem>
@@ -61,5 +57,5 @@
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry os="linux-mips-patch">
       <term>Linux-MIPS Merge Patch - 3.9 MB:</term>
       <listitem>
@@ -69,5 +65,5 @@
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry os="linux-mips_fix-patch">
       <term>Linux MIPS Fixes Patch - 16 KB:</term>
       <listitem>
@@ -77,5 +73,5 @@
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry os="linux-libc-headers-mips_atomic_fix-patch">
       <term>Linux Headers Atomic Fix Patch - 1 KB:</term>
       <listitem>
@@ -85,5 +81,5 @@
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry os="linux-libc-headers-mips_tls-patch">
       <term>Linux Headers TLS Patch - 3.2 KB:</term>
       <listitem>
@@ -93,5 +89,5 @@
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry os="make-mips_update-patch">
       <term>Make Config Update Patch - 33 KB:</term>
       <listitem>
@@ -101,5 +97,5 @@
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry os="mktemp-mips_update-patch">
       <term>Mktemp Config Update Patch - 56 KB:</term>
       <listitem>
@@ -109,5 +105,5 @@
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry os="module-init-tools-mips_update-patch">
       <term>Module-init-tools Config Update Patch - 33 KB:</term>
       <listitem>
@@ -117,5 +113,5 @@
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry os="procps-mips-patch">
       <term>Procps Signal 11 Patch - 1 KB:</term>
       <listitem>
Index: BOOK/materials/mips64-64/patches.xml
===================================================================
--- BOOK/materials/mips64-64/patches.xml	(revision 9e7b1379a6032b7bec70e494c998e4739b11cb47)
+++ BOOK/materials/mips64-64/patches.xml	(revision 5bd60e2df02cbeb92610cc0edf797a64c3b06802)
@@ -13,106 +13,67 @@
   <variablelist role="materials">
 
-    <varlistentry>
-      <term>File Config Update Patch - 35 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;file/&file-mips_update-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='file-mips_update-patch'])"/>
 
-    <varlistentry>
-      <term>Flex Config Update Patch - 33 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;flex/&flex-mips_update-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='flex-mips_update-patch'])"/>
 
-    <varlistentry>
-      <term>GCC Specs Patch - 14 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;gcc/&gcc-specs_pure64-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='gcc-mips_tls-patch'])"/>
 
-    <varlistentry>
-      <term>Grep Config Update Patch - 48 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;grep/&grep-mips_update-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64-64/patches.xml"
+    xpointer="xpointer(//*[@os='gcc-pure64-patch'])"/>
 
-    <varlistentry>
-      <term>Linux-MIPS Merge Patch - 2.2 MB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;linux/&linux-mips-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64-64/patches.xml"
+    xpointer="xpointer(//*[@os='gcc-specs_pure64-patch'])"/>
 
-    <varlistentry>
-      <term>Linux MIPS Fixes Patch - 2.2 MB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;linux/&linux-mips_fix-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='glibc-mips_nptl-patch'])"/>
 
-    <varlistentry>
-      <term>Linux Headers Atomic Fix Patch - 1 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;linux-libc-headers/&linux-libc-headers-mips_atomic_fix-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='grep-mips_update-patch'])"/>
 
-    <varlistentry>
-      <term>Linux Headers TLS Patch - 3.2 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;linux-libc-headers/&linux-libc-headers-mips_tls-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='linux-mips-patch'])"/>
 
-    <varlistentry>
-      <term>Make Config Update Patch - 33 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;make/&make-mips_update-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='linux-mips_fix-patch'])"/>
 
-    <varlistentry>
-      <term>Mktemp Config Update Patch - 56 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;mktemp/&mktemp-mips_update-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='linux-libc-headers-mips_atomic_fix-patch'])"/>
 
-    <varlistentry>
-      <term>Module-init-tools Config Update Patch - 33 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;module-init-tools/&module-init-tools-mips_update-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='linux-libc-headers-mips_tls-patch'])"/>
 
-    <varlistentry>
-      <term>Procps Signal 11 Patch - 1 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;procps/&procps-mips-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='make-mips_update-patch'])"/>
 
-    <varlistentry>
-      <term>Util-linux MIPS64 Patch - 1 KB:</term> <listitem>
-        <para><ulink
-        url="&patches-root;util-linux/&util-linux-mips64-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='mktemp-mips_update-patch'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='module-init-tools-mips_update-patch'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='procps-mips-patch'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips64/patches.xml"
+    xpointer="xpointer(//*[@os='util-linux-mips64-patch'])"/>
 
   </variablelist>
Index: BOOK/materials/mips64/patches.xml
===================================================================
--- BOOK/materials/mips64/patches.xml	(revision 9e7b1379a6032b7bec70e494c998e4739b11cb47)
+++ BOOK/materials/mips64/patches.xml	(revision 5bd60e2df02cbeb92610cc0edf797a64c3b06802)
@@ -13,125 +13,73 @@
   <variablelist role="materials">
 
-    <varlistentry>
-      <term>Binutils Multilib Patch - 3 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;binutils/&binutils-multilib-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/patches.xml"
+    xpointer="xpointer(//*[@os='binutils-multilib-patch'])"/>
 
-    <varlistentry>
-      <term>File Config Update Patch - 35 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;file/&file-mips_update-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='file-mips_update-patch'])"/>
 
-    <varlistentry>
-      <term>Flex Config Update Patch - 33 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;flex/&flex-mips_update-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='flex-mips_update-patch'])"/>
 
-    <varlistentry>
-      <term>GCC Specs Patch - 14 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;gcc/&gcc-specs-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='gcc-mips_tls-patch'])"/>
 
-    <varlistentry>
-      <term>Grep Config Update Patch - 48 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;grep/&grep-mips_update-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/patches.xml"
+    xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
-    <varlistentry>
-      <term>Linux-MIPS Merge Patch - 3.9 MB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;linux/&linux-mips-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='glibc-mips_nptl-patch'])"/>
 
-    <varlistentry>
-      <term>Linux MIPS Fixes Patch - 16 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;linux/&linux-mips_fix-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='grep-mips_update-patch'])"/>
 
-    <varlistentry>
-      <term>Linux Headers Atomic Fix Patch - 1 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;linux-libc-headers/&linux-libc-headers-mips_atomic_fix-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='linux-mips-patch'])"/>
 
-    <varlistentry>
-      <term>Linux Headers TLS Patch - 3.2 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;linux-libc-headers/&linux-libc-headers-mips_tls-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='linux-mips_fix-patch'])"/>
 
-    <varlistentry>
-      <term>Make Config Update Patch - 33 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;make/&make-mips_update-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='linux-libc-headers-mips_atomic_fix-patch'])"/>
 
-    <varlistentry>
-      <term>Mktemp Config Update Patch - 56 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;mktemp/&mktemp-mips_update-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='linux-libc-headers-mips_tls-patch'])"/>
 
-    <varlistentry>
-      <term>Module-init-tools Config Update Patch - 33 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;module-init-tools/&module-init-tools-mips_update-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='make-mips_update-patch'])"/>
 
-    <varlistentry>
-      <term>Perl Configure Multilib Patch - 1.4 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;perl/&perl-multilib-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='mktemp-mips_update-patch'])"/>
 
-    <varlistentry>
-      <term>Perl Libc lib64 Patch - 0.9 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;perl/&perl-lib64-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='module-init-tools-mips_update-patch'])"/>
 
-    <varlistentry>
-      <term>Procps Signal 11 Patch - 1 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;procps/&procps-mips-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/patches.xml"
+    xpointer="xpointer(//*[@os='perl-multilib-patch'])"/>
 
-    <varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/patches.xml"
+    xpointer="xpointer(//*[@os='perl-lib64-patch'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/patches.xml"
+    xpointer="xpointer(//*[@os='procps-mips-patch'])"/>
+
+    <varlistentry os="util-linux-mips64-patch">
       <term>Util-linux MIPS64 Patch - 1 KB:</term> <listitem>
         <para><ulink
Index: BOOK/materials/ppc/patches.xml
===================================================================
--- BOOK/materials/ppc/patches.xml	(revision 9e7b1379a6032b7bec70e494c998e4739b11cb47)
+++ BOOK/materials/ppc/patches.xml	(revision 5bd60e2df02cbeb92610cc0edf797a64c3b06802)
@@ -13,11 +13,7 @@
   <variablelist role="materials">
 
-    <varlistentry>
-      <term>GCC Specs Patch - 14 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;gcc/&gcc-specs-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/patches.xml"
+    xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
     <varlistentry>
Index: BOOK/materials/sparc/patches.xml
===================================================================
--- BOOK/materials/sparc/patches.xml	(revision 9e7b1379a6032b7bec70e494c998e4739b11cb47)
+++ BOOK/materials/sparc/patches.xml	(revision 5bd60e2df02cbeb92610cc0edf797a64c3b06802)
@@ -13,5 +13,5 @@
   <variablelist role="materials">
 
-    <varlistentry>
+    <varlistentry os="binutils-sparc_aout-patch">
       <term>Binutils Sparc aout Patch - 1 KB:</term>
       <listitem>
@@ -21,5 +21,5 @@
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry os="binutils-sparc_tls-patch">
       <term>Binutils TLS Patch - 153 KB:</term>
       <listitem>
@@ -29,13 +29,9 @@
     </varlistentry>
 
-    <varlistentry>
-      <term>GCC Specs Patch - 14 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;gcc/&gcc-specs-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/patches.xml"
+    xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
-    <varlistentry>
+    <varlistentry os="glibc-sparc_tls-patch">
       <term>Glibc Sparc TLS Patch - 4 KB:</term>
       <listitem>
@@ -45,5 +41,5 @@
     </varlistentry>
 
-   <varlistentry>
+   <varlistentry os="kbd-sparc_kbdrate-patch">
       <term>KBD kbdrate Patch - 1 KB:</term>
       <listitem>
@@ -53,5 +49,5 @@
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry os="linux-libc-headers-sparc_conflicts-patch">
       <term>Linux-libc-headers Sparc Conflicts Patch - 1 KB:</term>
       <listitem>
@@ -61,5 +57,5 @@
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry os="silo-fixes-patch">
       <term>Silo Fixes Patch - 4 KB:</term>
       <listitem>
Index: BOOK/materials/sparc64-64/patches.xml
===================================================================
--- BOOK/materials/sparc64-64/patches.xml	(revision 9e7b1379a6032b7bec70e494c998e4739b11cb47)
+++ BOOK/materials/sparc64-64/patches.xml	(revision 5bd60e2df02cbeb92610cc0edf797a64c3b06802)
@@ -13,67 +13,35 @@
   <variablelist role="materials">
 
-    <varlistentry>
-      <term>Binutils Multilib Patch - 3 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;binutils/&binutils-multilib-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/patches.xml"
+    xpointer="xpointer(//*[@os='binutils-sparc_aout-patch'])"/>
 
-    <varlistentry>
-      <term>Binutils Sparc aout Patch - 1 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;binutils/&binutils-sparc_aout-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/patches.xml"
+    xpointer="xpointer(//*[@os='binutils-sparc_tls-patch'])"/>
 
-    <varlistentry>
-      <term>Binutils TLS Patch - 153 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;binutils/&binutils-sparc_tls-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64-64/patches.xml"
+    xpointer="xpointer(//*[@os='gcc-pure64-patch'])"/>
 
-    <varlistentry>
-      <term>GCC Specs Patch - 14 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;gcc/&gcc-specs_pure64-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64-64/patches.xml"
+    xpointer="xpointer(//*[@os='gcc-specs_pure64-patch'])"/>
 
-    <varlistentry>
-      <term>Glibc TLS Patch - 4 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;glibc/&glibc-sparc_tls-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/patches.xml"
+    xpointer="xpointer(//*[@os='glibc-sparc_tls-patch'])"/>
 
-   <varlistentry>
-      <term>KBD kbdrate Patch - 1 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;kbd/&kbd-sparc_kbdrate-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/patches.xml"
+    xpointer="xpointer(//*[@os='kbd-sparc_kbdrate-patch'])"/>
 
-    <varlistentry>
-      <term>Linux-libc-headers Sparc Conflicts Patch - 1 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;linux-libc-headers/&linux-libc-headers-sparc_conflicts-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/patches.xml"
+    xpointer="xpointer(//*[@os='linux-libc-headers-sparc_conflicts-patch'])"/>
 
-    <varlistentry>
-      <term>Silo Fixes Patch - 3.5 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;silo/&silo-fixes-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/patches.xml"
+    xpointer="xpointer(//*[@os='silo-fixes-patch'])"/>
 
   </variablelist>
Index: BOOK/materials/sparc64/patches.xml
===================================================================
--- BOOK/materials/sparc64/patches.xml	(revision 9e7b1379a6032b7bec70e494c998e4739b11cb47)
+++ BOOK/materials/sparc64/patches.xml	(revision 5bd60e2df02cbeb92610cc0edf797a64c3b06802)
@@ -9,55 +9,31 @@
   <?dbhtml filename="patches-sparc64.html"?>
 
-  <title>Additional Patches for Sparc64</title>
+  <title>Additional Patches for Sparc64 Multilib</title>
 
   <variablelist role="materials">
 
-    <varlistentry>
-      <term>Binutils Multilib Patch - 3 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;binutils/&binutils-multilib-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/patches.xml"
+    xpointer="xpointer(//*[@os='binutils-multilib-patch'])"/>
 
-    <varlistentry>
-      <term>Binutils Sparc aout Patch - 1 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;binutils/&binutils-sparc_aout-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/patches.xml"
+    xpointer="xpointer(//*[@os='binutils-sparc_aout-patch'])"/>
 
-    <varlistentry>
-      <term>Binutils TLS Patch - 153 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;binutils/&binutils-sparc_tls-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/patches.xml"
+    xpointer="xpointer(//*[@os='binutils-sparc_tls-patch'])"/>
 
-    <varlistentry>
-      <term>GCC Specs Patch - 14 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;gcc/&gcc-specs-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/patches.xml"
+    xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
-    <varlistentry>
-      <term>Glibc TLS Patch - 4 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;glibc/&glibc-sparc_tls-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/patches.xml"
+    xpointer="xpointer(//*[@os='glibc-sparc_tls-patch'])"/>
 
-   <varlistentry>
-      <term>KBD kbdrate Patch - 1 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;kbd/&kbd-sparc_kbdrate-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/patches.xml"
+    xpointer="xpointer(//*[@os='kbd-sparc_kbdrate-patch'])"/>
 
     <varlistentry>
@@ -69,35 +45,19 @@
     </varlistentry>
 
-    <varlistentry>
-      <term>Linux-libc-headers Sparc Conflicts Patch - 1 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;linux-libc-headers/&linux-libc-headers-sparc_conflicts-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/patches.xml"
+    xpointer="xpointer(//*[@os='linux-libc-headers-sparc_conflicts-patch'])"/>
 
-    <varlistentry>
-      <term>Perl Configure Multilib Patch - 1.4 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;perl/&perl-multilib-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/patches.xml"
+    xpointer="xpointer(//*[@os='perl-multilib-patch'])"/>
 
-    <varlistentry>
-      <term>Perl Libc lib64 Patch - 0.9 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;perl/&perl-lib64-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/patches.xml"
+    xpointer="xpointer(//*[@os='perl-lib64-patch'])"/>
 
-    <varlistentry>
-      <term>Silo Fixes Patch - 4 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;silo/&silo-fixes-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/patches.xml"
+    xpointer="xpointer(//*[@os='silo-fixes-patch'])"/>
 
   </variablelist>
Index: BOOK/materials/x86/patches.xml
===================================================================
--- BOOK/materials/x86/patches.xml	(revision 9e7b1379a6032b7bec70e494c998e4739b11cb47)
+++ BOOK/materials/x86/patches.xml	(revision 5bd60e2df02cbeb92610cc0edf797a64c3b06802)
@@ -13,5 +13,5 @@
   <variablelist role="materials">
 
-    <varlistentry>
+    <varlistentry os="coreutils-x86_uname-patch">
       <term>Coreutils Uname Patch - 1 KB:</term>
       <listitem>
@@ -21,5 +21,5 @@
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry os="gcc-specs-patch">
       <term>GCC Specs Patch - 14 KB:</term>
       <listitem>
Index: BOOK/materials/x86_64-64/patches.xml
===================================================================
--- BOOK/materials/x86_64-64/patches.xml	(revision 9e7b1379a6032b7bec70e494c998e4739b11cb47)
+++ BOOK/materials/x86_64-64/patches.xml	(revision 5bd60e2df02cbeb92610cc0edf797a64c3b06802)
@@ -13,21 +13,9 @@
   <variablelist role="materials">
 
-    <varlistentry>
-      <term>Binutils Multilib Patch - 3 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;binutils/&binutils-multilib-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/patches.xml"
+    xpointer="xpointer(//*[@os='coreutils-x86_uname-patch'])"/>
 
-    <varlistentry>
-      <term>Coreutils Uname Patch - 1 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;coreutils/&coreutils-x86_uname-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
+    <varlistentry os="gcc-pure64-patch">
       <term>GCC Pure 64 Patch - 7 KB:</term>
       <listitem>
@@ -37,5 +25,5 @@
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry os="gcc-specs_pure64-patch">
       <term>GCC Specs Patch - 14 KB:</term>
       <listitem>
Index: BOOK/materials/x86_64/patches.xml
===================================================================
--- BOOK/materials/x86_64/patches.xml	(revision 9e7b1379a6032b7bec70e494c998e4739b11cb47)
+++ BOOK/materials/x86_64/patches.xml	(revision 5bd60e2df02cbeb92610cc0edf797a64c3b06802)
@@ -9,9 +9,9 @@
   <?dbhtml filename="patches-x86_64.html"?>
 
-  <title>Additional Patches for x86_64</title>
+  <title>Additional Patches for x86_64 Multilib</title>
 
   <variablelist role="materials">
 
-    <varlistentry>
+    <varlistentry os="binutils-multilib-patch">
       <term>Binutils Multilib Patch - 3 KB:</term>
       <listitem>
@@ -21,19 +21,11 @@
     </varlistentry>
 
-    <varlistentry>
-      <term>Coreutils Uname Patch - 1 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;coreutils/&coreutils-x86_uname-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/patches.xml"
+    xpointer="xpointer(//*[@os='coreutils-x86_uname-patch'])"/>
 
-    <varlistentry>
-      <term>GCC Specs Patch - 14 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;gcc/&gcc-specs-patch;"/></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/patches.xml"
+    xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
     <varlistentry>
@@ -45,5 +37,5 @@
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry os="perl-multilib-patch">
       <term>Perl Configure Multilib Patch - 1.4 KB:</term>
       <listitem>
@@ -53,5 +45,5 @@
     </varlistentry>
 
-    <varlistentry>
+    <varlistentry os="perl-lib64-patch">
       <term>Perl Libc lib64 Patch - 0.9 KB:</term>
       <listitem>
