Index: BOOK/cross-tools/sparcv8/glibc.xml
===================================================================
--- BOOK/cross-tools/sparcv8/glibc.xml	(revision 4e3e507ee8b24a64ece74e4c3381e6cae9184496)
+++ BOOK/cross-tools/sparcv8/glibc.xml	(revision b3704979189302ea13d26da8470316117f7d73b7)
@@ -9,5 +9,5 @@
   <?dbhtml filename="glibc.html"?>
 
-  <title>Glibc-&glibc-linuxthreads-version;</title>
+  <title>Glibc-&glibc-version;</title>
 
   <indexterm zone="ch-cross-tools-glibc">
@@ -31,17 +31,9 @@
     xpointer="xpointer(//*[@os='l1'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparcv8/glibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
-
-    <para os="l3">If you require libidn support, you can add it
-    by unpacking <filename>glibc-libidn-&glibc-linuxthreads-version;</filename>
-    tarball from within the <filename class="directory">glibc-&glibc-linuxthreads-version;</filename>
-    directory. If you use libidn here, you will also need to build it during
-    the final-system build.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparcv8/glibc.xml"
-    xpointer="xpointer(//*[@os='l4'])"/>
+<screen os="l2"><userinput>cd ..
+tar jxvf glibc-ports-&glibc-ports-version;.tar.bz2
+cd glibc-ports-&glibc-ports-version;
+mv linuxthreads* ../glibc-&glibc-version;
+cd ../glibc-&glibc-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -49,5 +41,7 @@
     xpointer="xpointer(//*[@os='db'])"/>
 
-<screen os="dc"><userinput>patch -Np1 -i ../&glibc-linuxthreads-libgcc_eh-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -60,18 +54,18 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparcv8/glibc.xml"
+    href="../../final-system/sparc/glibc.xml"
     xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparcv8/glibc.xml"
+    href="../../final-system/sparc/glibc.xml"
     xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/sparcv8/glibc.xml"
-    xpointer="xpointer(//*[@os='l5'])"/>
+    xpointer="xpointer(//*[@os='l3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/sparcv8/glibc.xml"
-    xpointer="xpointer(//*[@os='l6'])"/>
+    xpointer="xpointer(//*[@os='l4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -87,7 +81,11 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='df'])"/>
+
 <screen os="df"><userinput>BUILD_CC="gcc" CC="${LFS_TARGET}-gcc" \
     AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
-    ../glibc-&glibc-linuxthreads-version;/configure --prefix=/tools \
+    ../glibc-&glibc-version;/configure --prefix=/tools \
     --host=${LFS_TARGET} --build=${LFS_HOST} \
     --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
Index: BOOK/final-system/sparcv8/glibc.xml
===================================================================
--- BOOK/final-system/sparcv8/glibc.xml	(revision 4e3e507ee8b24a64ece74e4c3381e6cae9184496)
+++ BOOK/final-system/sparcv8/glibc.xml	(revision b3704979189302ea13d26da8470316117f7d73b7)
@@ -7,5 +7,5 @@
 
 <sect1 id="ch-system-glibc" role="wrap">
-  <title>Glibc-&glibc-linuxthreads-version;</title>
+  <title>Glibc-&glibc-version;</title>
 
   <?dbhtml filename="glibc.html"?>
@@ -30,36 +30,23 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
-    <para os="l1">This architecture does not currently support NPTL, so we will
-    have to include Glibc Linuxthreads as a threading library. Building
-    for a Linuxthreads based glibc you will need to unpack the
-    <filename>glibc-linuxthreads-&glibc-linuxthreads-version;</filename> tarball from
-    within the <filename class="directory">glibc-&glibc-linuxthreads-version;</filename>
-    directory.</para>
-
-<screen os="l2"><userinput>tar -xjvf /sources/glibc-linuxthreads-&glibc-linuxthreads-version;.tar.bz2</userinput></screen>
-
-    <para os="l3">If you require libidn support, you can add it
-    by unpacking <filename>glibc-libidn-&glibc-linuxthreads-version;</filename>
-    tarball from within the <filename class="directory">glibc-&glibc-linuxthreads-version;</filename>
-    directory. If you used libidn during your cross-tools build, you will need to add it
-    here also.</para>
-
-<screen os="l4"><userinput>tar -xjvf /sources/glibc-libidn-&glibc-linuxthreads-version;.tar.bz2</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="d"><userinput>patch -Np1 -i ../&glibc-linuxthreads-localedef_segfault-patch;</userinput></screen>
+<para os="l1">This architecture does not support NPTL. So we need to untar the
+<filename>glibc-ports-&glibc-ports-version;.tar.bz2</filename> and move the
+linuxthreads directories. The following commands will accomplish the task:</para>
 
-   <para os="s1">This patch will fix an obsolete gcc option that was removed in
-   GCC 4.x:</para>
-
-<screen os="s2"><userinput>patch -Np1 -i ../&glibc-sparc_gcc4_fixes-patch;</userinput></screen>
-
-    <para os="l5">NPTL is not supported on Sparc v8 and below, so we need to remove the NPTL from our build.
+<screen os="l2"><userinput>tar jxvf glibc-ports-&glibc-ports-version;.tar.bz2 \
+--strip-components=1 glibc-&glibc-ports-version;/linuxthreads*</userinput></screen>
+    
+    <para os="l3">NPTL is not supported on Sparc v8 and below, so we need to remove the NPTL from our build.
     We do this by removing the NPTL directories:</para>
 
-<screen os="l6"><userinput>rm -rf nptl*</userinput></screen>
+<screen os="l4"><userinput>rm -rf nptl*</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -75,7 +62,7 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen os="h"><userinput>../glibc-&glibc-linuxthreads-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib/glibc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 4e3e507ee8b24a64ece74e4c3381e6cae9184496)
+++ BOOK/introduction/common/changelog.xml	(revision b3704979189302ea13d26da8470316117f7d73b7)
@@ -37,4 +37,15 @@
 -->
 
+    <listitem>
+      <para>December 6, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Upgraded to Glibc 20051107.</para>
+        </listitem>
+        <listitem>
+          <para>[jim] - Sparcv8 now uses the same Glibc as the other architectures.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: OK/materials/common/packages2.xml
===================================================================
--- BOOK/materials/common/packages2.xml	(revision 4e3e507ee8b24a64ece74e4c3381e6cae9184496)
+++ 	(revision )
@@ -1,270 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-common">
-  <?dbhtml filename="packages.html"?>
-
-  <title>All Packages</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <variablelist role="materials">
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <varlistentry>
-      <term>Glibc (&glibc-linuxthreads-version;) - &glibc-linuxthreads-size;:</term>
-      <listitem>
-        <para><ulink url="&glibc-linuxthreads-url;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Glibc Libidn (&glibc-linuxthreads-version;) - &glibc-linuxthreads-libidn-size;:</term>
-      <listitem>
-        <para><ulink url="&glibc-linuxthreads-libidn-url;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Glibc Linuxthreads (&glibc-linuxthreads-version;) - &glibc-linuxthreads-linuxthreads-size;:</term>
-      <listitem>
-        <para><ulink url="&glibc-linuxthreads-linuxthreads-url;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-	
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='ak'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='al'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='am'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='ao'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='ap'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='aq'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='ar'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='as'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='at'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='au'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='av'])"/>
-	
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='aw'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='ax'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='ay'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='az'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='bc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-  </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="packages.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-</sect1>
Index: OK/materials/common/patches2.xml
===================================================================
--- BOOK/materials/common/patches2.xml	(revision 4e3e507ee8b24a64ece74e4c3381e6cae9184496)
+++ 	(revision )
@@ -1,141 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-common">
-  <?dbhtml filename="patches.html"?>
-
-  <title>Needed Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <variablelist role="materials">
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p7'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p8'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p9'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p10'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p11'])"/>
-
-    <varlistentry>
-      <term>Glibc Disable linking with libgcc_eh.a - 1 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;glibc/&glibc-linuxthreads-libgcc_eh-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Glibc Localedef Segfault - 2 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;glibc/&glibc-linuxthreads-localedef_segfault-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p14'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p15'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p16'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p17'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p18'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p19'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p20'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p21'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p22'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p23'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p24'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p25'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p26'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="patches.xml"
-    xpointer="xpointer(//*[@os='p27'])"/>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="patches.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-</sect1>
Index: BOOK/materials/sparcv8-chapter.xml
===================================================================
--- BOOK/materials/sparcv8-chapter.xml	(revision 4e3e507ee8b24a64ece74e4c3381e6cae9184496)
+++ BOOK/materials/sparcv8-chapter.xml	(revision b3704979189302ea13d26da8470316117f7d73b7)
@@ -13,7 +13,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/packages2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/packages.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patches2.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patches.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparcv8/patches.xml"/>
 
Index: BOOK/materials/sparcv8/patches.xml
===================================================================
--- BOOK/materials/sparcv8/patches.xml	(revision 4e3e507ee8b24a64ece74e4c3381e6cae9184496)
+++ BOOK/materials/sparcv8/patches.xml	(revision b3704979189302ea13d26da8470316117f7d73b7)
@@ -21,12 +21,4 @@
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
-    <varlistentry os="glibc-sparc_gcc4_fixes-patch">
-      <term>Glibc GCC4 Patch - 1 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;glibc/&glibc-sparc_gcc4_fixes-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../sparc/patches.xml"
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision 4e3e507ee8b24a64ece74e4c3381e6cae9184496)
+++ BOOK/packages.ent	(revision b3704979189302ea13d26da8470316117f7d73b7)
@@ -94,17 +94,11 @@
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.gz">
 
-<!ENTITY glibc-version "20051024">
-<!ENTITY glibc-size "14 MB">
+<!ENTITY glibc-version "20051107">
+<!ENTITY glibc-size "15 MB">
 <!ENTITY glibc-url "ftp://sources.redhat.com/pub/glibc/snapshots/glibc-&glibc-version;.tar.bz2">
 
-<!ENTITY glibc-linuxthreads-version "2.3.6">
-<!ENTITY glibc-linuxthreads-size "14 MB">
-<!ENTITY glibc-linuxthreads-url "&gnu;glibc/glibc-&glibc-linuxthreads-version;.tar.bz2">
-
-<!ENTITY glibc-linuxthreads-linuxthreads-size "238 KB">
-<!ENTITY glibc-linuxthreads-linuxthreads-url "&gnu;glibc/glibc-linuxthreads-&glibc-linuxthreads-version;.tar.bz2">
-
-<!ENTITY glibc-linuxthreads-libidn-size "99 KB">
-<!ENTITY glibc-linuxthreads-libidn-url "&gnu;glibc/glibc-libidn-&glibc-linuxthreads-version;.tar.bz2">
+<!ENTITY glibc-ports-version "20051107">
+<!ENTITY glibc-ports-size "472 KB">
+<!ENTITY glibc-ports-url "ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-&glibc-ports-version;.tar.bz2">
 
 <!ENTITY grep-version "2.5.1a">
