Index: BOOK/cross-tools/64/glibc.xml
===================================================================
--- BOOK/cross-tools/64/glibc.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/cross-tools/64/glibc.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -42,4 +42,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/alpha/glibc.xml
===================================================================
--- BOOK/cross-tools/alpha/glibc.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/cross-tools/alpha/glibc.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -50,4 +50,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/common/glibc.xml
===================================================================
--- BOOK/cross-tools/common/glibc.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/cross-tools/common/glibc.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -38,4 +38,12 @@
     href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips/glibc.xml
===================================================================
--- BOOK/cross-tools/mips/glibc.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/cross-tools/mips/glibc.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -50,4 +50,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips64-64/glibc.xml
===================================================================
--- BOOK/cross-tools/mips64-64/glibc.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/cross-tools/mips64-64/glibc.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -50,4 +50,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips64/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/mips64/glibc-64bit.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/cross-tools/mips64/glibc-64bit.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -50,4 +50,12 @@
     href="glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips64/glibc-n32.xml
===================================================================
--- BOOK/cross-tools/mips64/glibc-n32.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/cross-tools/mips64/glibc-n32.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -50,4 +50,12 @@
     href="glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips64/glibc.xml
===================================================================
--- BOOK/cross-tools/mips64/glibc.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/cross-tools/mips64/glibc.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -50,4 +50,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/multilib/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/multilib/glibc-64bit.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/cross-tools/multilib/glibc-64bit.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -42,4 +42,12 @@
     href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/multilib/glibc.xml
===================================================================
--- BOOK/cross-tools/multilib/glibc.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/cross-tools/multilib/glibc.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -42,4 +42,12 @@
     href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/ppc/glibc.xml
===================================================================
--- BOOK/cross-tools/ppc/glibc.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/cross-tools/ppc/glibc.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -42,4 +42,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/ppc64/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/ppc64/glibc-64bit.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/cross-tools/ppc64/glibc-64bit.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -42,4 +42,12 @@
     href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/ppc64/glibc.xml
===================================================================
--- BOOK/cross-tools/ppc64/glibc.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/cross-tools/ppc64/glibc.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -42,4 +42,12 @@
     href="../../final-system/common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/sparc64-64/glibc.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/glibc.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/cross-tools/sparc64-64/glibc.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -42,4 +42,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/sparc64/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/sparc64/glibc-64bit.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/cross-tools/sparc64/glibc-64bit.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -42,4 +42,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/alpha/glibc.xml
===================================================================
--- BOOK/final-system/alpha/glibc.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/final-system/alpha/glibc.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -41,4 +41,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/common/glibc.xml
===================================================================
--- BOOK/final-system/common/glibc.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/final-system/common/glibc.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -50,4 +50,9 @@
 
 <screen os="d"><userinput>patch -Np1 -i ../&glibc-localedef_segfault-patch;</userinput></screen>
+
+    <para os="p1">The following corrects the Minor version, changing the value
+    from 4 to 5:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&glibc-minor-patch;</userinput></screen>
 
     <para os="s1">The following <command>sed</command> fixes a build issue
Index: BOOK/final-system/mips/glibc.xml
===================================================================
--- BOOK/final-system/mips/glibc.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/final-system/mips/glibc.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -45,4 +45,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64-64/glibc.xml
===================================================================
--- BOOK/final-system/mips64-64/glibc.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/final-system/mips64-64/glibc.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -41,4 +41,20 @@
     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='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/mips64/glibc-64bit.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/final-system/mips64/glibc-64bit.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -41,4 +41,12 @@
     href="glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64/glibc-n32.xml
===================================================================
--- BOOK/final-system/mips64/glibc-n32.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/final-system/mips64/glibc-n32.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -41,4 +41,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64/glibc.xml
===================================================================
--- BOOK/final-system/mips64/glibc.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/final-system/mips64/glibc.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -46,4 +46,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/glibc-64bit.xml
===================================================================
--- BOOK/final-system/multilib/glibc-64bit.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/final-system/multilib/glibc-64bit.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -33,4 +33,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/glibc.xml
===================================================================
--- BOOK/final-system/multilib/glibc.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/final-system/multilib/glibc.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -38,4 +38,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/ppc64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/ppc64/glibc-64bit.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/final-system/ppc64/glibc-64bit.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -33,4 +33,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/ppc64/glibc.xml
===================================================================
--- BOOK/final-system/ppc64/glibc.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/final-system/ppc64/glibc.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -38,4 +38,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc/glibc.xml
===================================================================
--- BOOK/final-system/sparc/glibc.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/final-system/sparc/glibc.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -41,4 +41,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/sparc64/glibc-64bit.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/final-system/sparc64/glibc-64bit.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -31,14 +31,14 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc64/glibc.xml
===================================================================
--- BOOK/final-system/sparc64/glibc.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/final-system/sparc64/glibc.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -30,4 +30,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/x86/glibc.xml
===================================================================
--- BOOK/final-system/x86/glibc.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/final-system/x86/glibc.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -37,4 +37,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/x86_64-64/glibc.xml
===================================================================
--- BOOK/final-system/x86_64-64/glibc.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/final-system/x86_64-64/glibc.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -37,4 +37,12 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/glibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/introduction/common/changelog.xml	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -48,4 +48,7 @@
           prevent a build failure.</para>
         </listitem>
+        <listitem>
+          <para>[jim] - Added Patch for a Versioning issue with Glibc 2.5.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision 6cea094f4de8329040baca9678a18f53ac0db509)
+++ BOOK/patches.ent	(revision dcc1eee2e68fd6aad0df504a97257720df09c599)
@@ -57,4 +57,8 @@
 <!ENTITY gcc-specs-patch-size "15 KB">
 
+<!ENTITY glibc-minor-patch "glibc-&glibc-version;-MINOR-1.patch">
+<!ENTITY glibc-minor-patch-md5 "b782dff6ec9531e062aa019cb4198aed">
+<!ENTITY glibc-minort-patch-size "4 KB">
+
 <!ENTITY glibc-libgcc_eh-patch "glibc-&glibc-version;-libgcc_eh-1.patch">
 <!ENTITY glibc-libgcc_eh-patch-md5 "e5122ea7b89a5f22615eaadf8e46b334">
