Index: BOOK/cross-tools/64/eglibc.xml
===================================================================
--- BOOK/cross-tools/64/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/cross-tools/64/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -26,12 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/alpha/eglibc-headers.xml
===================================================================
--- BOOK/cross-tools/alpha/eglibc-headers.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/cross-tools/alpha/eglibc-headers.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -22,12 +22,4 @@
   <sect2 role="installation">
     <title>Installation of EGLIBC Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <para os="s1">EGLIBC's <filename>configure</filename> script checks the
Index: BOOK/cross-tools/alpha/eglibc.xml
===================================================================
--- BOOK/cross-tools/alpha/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/cross-tools/alpha/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -26,12 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/common/eglibc.xml
===================================================================
--- BOOK/cross-tools/common/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/cross-tools/common/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -26,12 +26,4 @@
     the method suggested in this book puts the stability of the system at
     risk.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <para os="db">Disable linking to <filename>libgcc_eh</filename>:</para>
Index: BOOK/cross-tools/mips/eglibc.xml
===================================================================
--- BOOK/cross-tools/mips/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/cross-tools/mips/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -26,12 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips64-64/eglibc.xml
===================================================================
--- BOOK/cross-tools/mips64-64/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/cross-tools/mips64-64/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -26,12 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips64/eglibc-64bit.xml
===================================================================
--- BOOK/cross-tools/mips64/eglibc-64bit.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/cross-tools/mips64/eglibc-64bit.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -26,12 +26,4 @@
     href="eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips64/eglibc-n32.xml
===================================================================
--- BOOK/cross-tools/mips64/eglibc-n32.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/cross-tools/mips64/eglibc-n32.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -26,12 +26,4 @@
     href="eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips64/eglibc.xml
===================================================================
--- BOOK/cross-tools/mips64/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/cross-tools/mips64/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -26,12 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/multilib/eglibc-64bit.xml
===================================================================
--- BOOK/cross-tools/multilib/eglibc-64bit.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/cross-tools/multilib/eglibc-64bit.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -26,12 +26,4 @@
     href="eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/multilib/eglibc.xml
===================================================================
--- BOOK/cross-tools/multilib/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/cross-tools/multilib/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -26,12 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/ppc/eglibc.xml
===================================================================
--- BOOK/cross-tools/ppc/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/cross-tools/ppc/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -26,12 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/ppc64/eglibc-64bit.xml
===================================================================
--- BOOK/cross-tools/ppc64/eglibc-64bit.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/cross-tools/ppc64/eglibc-64bit.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -26,12 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/ppc64/eglibc.xml
===================================================================
--- BOOK/cross-tools/ppc64/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/cross-tools/ppc64/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -26,12 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/sparc64-64/eglibc.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/cross-tools/sparc64-64/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -26,12 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/sparc64/eglibc-64bit.xml
===================================================================
--- BOOK/cross-tools/sparc64/eglibc-64bit.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/cross-tools/sparc64/eglibc-64bit.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -26,12 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/sparc64/eglibc.xml
===================================================================
--- BOOK/cross-tools/sparc64/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/cross-tools/sparc64/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -26,12 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/x86/eglibc.xml
===================================================================
--- BOOK/cross-tools/x86/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/cross-tools/x86/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -26,12 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/x86_64/eglibc.xml
===================================================================
--- BOOK/cross-tools/x86_64/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/cross-tools/x86_64/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -26,12 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/alpha/eglibc.xml
===================================================================
--- BOOK/final-system/alpha/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/final-system/alpha/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -25,12 +25,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/common/eglibc.xml
===================================================================
--- BOOK/final-system/common/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/final-system/common/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -38,9 +38,4 @@
       Unicode, therefore libiconv is not required on a CLFS system.</para>
     </note>
-
-    <para os="mp1">The following patch fixes a compatibility issue with Make
-    3.82 and newer.</para>
-
-<screen os="mp2"><userinput>patch -Np1 -i ../&eglibc-make382-patch;</userinput></screen>
 
     <para os="l3">The following sed makes sure that newly built EGLIBC is tested,
Index: BOOK/final-system/mips/eglibc.xml
===================================================================
--- BOOK/final-system/mips/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/final-system/mips/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -25,12 +25,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64-64/eglibc.xml
===================================================================
--- BOOK/final-system/mips64-64/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/final-system/mips64-64/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -25,12 +25,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/mips64/eglibc-64bit.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/final-system/mips64/eglibc-64bit.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -21,12 +21,4 @@
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64/eglibc-n32.xml
===================================================================
--- BOOK/final-system/mips64/eglibc-n32.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/final-system/mips64/eglibc-n32.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -21,12 +21,4 @@
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64/eglibc.xml
===================================================================
--- BOOK/final-system/mips64/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/final-system/mips64/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -26,12 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/multilib/eglibc-64bit.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/final-system/multilib/eglibc-64bit.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -21,12 +21,4 @@
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/eglibc.xml
===================================================================
--- BOOK/final-system/multilib/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/final-system/multilib/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -26,12 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/ppc/eglibc.xml
===================================================================
--- BOOK/final-system/ppc/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/final-system/ppc/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -25,12 +25,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/ppc64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/ppc64/eglibc-64bit.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/final-system/ppc64/eglibc-64bit.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -21,12 +21,4 @@
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/ppc64/eglibc.xml
===================================================================
--- BOOK/final-system/ppc64/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/final-system/ppc64/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -26,12 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc64-64/eglibc.xml
===================================================================
--- BOOK/final-system/sparc64-64/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/final-system/sparc64-64/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -25,12 +25,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/sparc64/eglibc-64bit.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/final-system/sparc64/eglibc-64bit.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -21,12 +21,4 @@
   <sect2 role="installation">
     <title>Installation of EGLIBC</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/x86/eglibc.xml
===================================================================
--- BOOK/final-system/x86/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/final-system/x86/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -25,12 +25,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/x86_64-64/eglibc.xml
===================================================================
--- BOOK/final-system/x86_64-64/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/final-system/x86_64-64/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -25,12 +25,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/x86_64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/x86_64/eglibc-64bit.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/final-system/x86_64/eglibc-64bit.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -21,12 +21,4 @@
   <sect2 role="installation">
     <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/x86_64/eglibc.xml
===================================================================
--- BOOK/final-system/x86_64/eglibc.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/final-system/x86_64/eglibc.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -26,12 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/introduction/common/changelog.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -41,4 +41,7 @@
       <para>January 8, 2011</para>
       <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Updated EGlibc 2.12 to r12509.</para>
+        </listitem>
         <listitem>
           <para>[jciccone] - Updated GCC to 4.5.2.</para>
Index: BOOK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/materials/common/patches.xml	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -34,13 +34,4 @@
         url="&patches-root;&coreutils-uname-patch;"/></para>
         <para>MD5 sum: <literal>&coreutils-uname-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>EGLIBC Make 3.82 Compatiblity Patch - <token>&eglibc-make382-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&eglibc-make382-patch;"/></para>
-        <para>MD5 sum: <literal>&eglibc-make382-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/packages.ent	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -110,10 +110,9 @@
 
 <!ENTITY eglibc-version "2.12">
-<!ENTITY eglibc-date "20100725">
-<!ENTITY eglibc-revision "11059">
-<!ENTITY eglibc-fversion "&eglibc-version;-&eglibc-date;-r&eglibc-revision;">
-<!ENTITY eglibc-size "15,996 KB">
+<!ENTITY eglibc-revision "12509">
+<!ENTITY eglibc-fversion "&eglibc-version;-r&eglibc-revision;">
+<!ENTITY eglibc-size "16,016 KB">
 <!ENTITY eglibc-url "&packages-root;eglibc-&eglibc-fversion;.tar.bz2">
-<!ENTITY eglibc-md5 "828c070552138fa209f65a77fbcb48db">
+<!ENTITY eglibc-md5 "78d31bca19920f2de591910545dcd564">
 <!ENTITY eglibc-home "http://www.eglibc.org/home">
 <!ENTITY eglibc-ld-name "ld-&eglibc-version;.so">
@@ -121,6 +120,6 @@
 <!ENTITY eglibc-ports-version "&eglibc-version;">
 <!ENTITY eglibc-ports-size "632 KB">
-<!ENTITY eglibc-ports-url "&packages-root;eglibc-ports-&eglibc-version;-&eglibc-date;-r&eglibc-revision;.tar.bz2">
-<!ENTITY eglibc-ports-md5 "186f89e3f1391451b77d35a5127f1145">
+<!ENTITY eglibc-ports-url "&packages-root;eglibc-ports-&eglibc-version;-r&eglibc-revision;.tar.bz2">
+<!ENTITY eglibc-ports-md5 "a90dc5cd2104d68b54a9edae46e8f82b">
 <!ENTITY eglibc-ports-home " ">
 
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ BOOK/patches.ent	(revision df4f9cae26caee4cfa46cd512f0d43dd06e3531d)
@@ -20,8 +20,4 @@
 <!ENTITY flex-gcc44-patch-md5 "a6ffbba93d034380e12110bb6d399113">
 <!ENTITY flex-gcc44-patch-size "12 KB">
-
-<!ENTITY eglibc-make382-patch "eglibc-&eglibc-fversion;-make382-1.patch">
-<!ENTITY eglibc-make382-patch-md5 "4d8eb0f7f417271807449d930adf4f5c">
-<!ENTITY eglibc-make382-patch-size "4 KB">
 
 <!ENTITY gcc-specs-patch "gcc-&gcc-version;-specs-1.patch">
Index: tches/eglibc-2.12-20100725-r11059-make382-1.patch
===================================================================
--- patches/eglibc-2.12-20100725-r11059-make382-1.patch	(revision 670bf2c7c0c2aa2b2125f2e60da6e7da37427068)
+++ 	(revision )
@@ -1,24 +1,0 @@
-Submitted By: Joe Ciccone <jciccone@gmail.com
-Date: 2010-08-08
-Initial Package Version: 2.12
-Upstream Status: Unknown
-Origin: Joe Ciccone
-Description: Seperates the normal and implcit rules, make 3.82 complains
-             when they are defined on the same line.
-
-diff -Naur eglibc-2.12.orig/manual/Makefile eglibc-2.12/manual/Makefile
---- eglibc-2.12.orig/manual/Makefile	2010-03-31 19:12:26.000000000 +0000
-+++ eglibc-2.12/manual/Makefile	2010-08-08 20:29:22.905807775 +0000
-@@ -243,7 +243,11 @@
- .PHONY: stubs
- stubs: $(objpfx)stubs
- endif
--$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%:
-+$(objpfx)stubs ../po/manual.pot:
-+	$(make-target-directory)
-+	touch $@
-+
-+$(objpfx)stamp%:
- 	$(make-target-directory)
- 	touch $@
- 
