Index: BOOK/cross-tools/64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/64/gcc-final.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/cross-tools/64/gcc-final.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -23,5 +23,5 @@
     <title>Installation of GCC Cross Compiler</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -29,5 +29,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/64/gcc-static.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/cross-tools/64/gcc-static.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -24,5 +24,5 @@
     and no Threads</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -30,5 +30,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/common/binutils-32.xml
===================================================================
--- BOOK/cross-tools/common/binutils-32.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/cross-tools/common/binutils-32.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -27,4 +27,12 @@
     linker and assembler to determine which of their own features to
     enable.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/common/binutils.xml
===================================================================
--- BOOK/cross-tools/common/binutils.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/cross-tools/common/binutils.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -27,4 +27,12 @@
     linker and assembler to determine which of their own features to
     enable.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/common/gcc-final.xml
===================================================================
--- BOOK/cross-tools/common/gcc-final.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/cross-tools/common/gcc-final.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -23,5 +23,4 @@
     <title>Installation of GCC Cross Compiler</title>
 
-<!--
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
@@ -30,5 +29,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/common/gcc-static.xml
===================================================================
--- BOOK/cross-tools/common/gcc-static.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/cross-tools/common/gcc-static.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -24,8 +24,8 @@
     and no Threads</title>
 
-<!--    <para os="p1">The following patch contains a number of updates to the
+    <para os="p1">The following patch contains a number of updates to the
     &gcc-version; branch by the GCC developers:</para>
 
-    <screen os="p2"><userinput>patch -Np1 -i ../&gcc-branch_update-patch;</userinput></screen> -->
+    <screen os="p2"><userinput>patch -Np1 -i ../&gcc-branch_update-patch;</userinput></screen>
 
     <para os="aa">Make a couple of essential adjustments to the
Index: BOOK/cross-tools/mips/gcc-final.xml
===================================================================
--- BOOK/cross-tools/mips/gcc-final.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/cross-tools/mips/gcc-final.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -23,5 +23,5 @@
     <title>Installation of GCC Cross Compiler</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -29,5 +29,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/mips/gcc-static.xml
===================================================================
--- BOOK/cross-tools/mips/gcc-static.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/cross-tools/mips/gcc-static.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -24,5 +24,5 @@
     and no Threads</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -30,5 +30,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/mips64-64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/mips64-64/gcc-final.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/cross-tools/mips64-64/gcc-final.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -23,5 +23,5 @@
     <title>Installation of GCC Cross Compiler</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -29,5 +29,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/mips64-64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/mips64-64/gcc-static.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/cross-tools/mips64-64/gcc-static.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -24,5 +24,5 @@
     and no Threads</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -30,5 +30,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/mips64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/mips64/gcc-final.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/cross-tools/mips64/gcc-final.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -23,5 +23,5 @@
     <title>Installation of GCC Cross Compiler</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -29,5 +29,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/mips64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/mips64/gcc-static.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/cross-tools/mips64/gcc-static.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -24,5 +24,5 @@
     and no Threads</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -30,5 +30,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/multilib/binutils.xml
===================================================================
--- BOOK/cross-tools/multilib/binutils.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/cross-tools/multilib/binutils.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -26,4 +26,12 @@
     href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='da'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/multilib/gcc-final.xml
===================================================================
--- BOOK/cross-tools/multilib/gcc-final.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/cross-tools/multilib/gcc-final.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -23,5 +23,5 @@
     <title>Installation of GCC Cross Compiler</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -29,5 +29,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/multilib/gcc-static.xml
===================================================================
--- BOOK/cross-tools/multilib/gcc-static.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/cross-tools/multilib/gcc-static.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -24,5 +24,5 @@
     and no Threads</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -30,5 +30,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/ppc/gcc-final.xml
===================================================================
--- BOOK/cross-tools/ppc/gcc-final.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/cross-tools/ppc/gcc-final.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -23,5 +23,5 @@
     <title>Installation of GCC Cross Compiler</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -29,5 +29,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/ppc/gcc-static.xml
===================================================================
--- BOOK/cross-tools/ppc/gcc-static.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/cross-tools/ppc/gcc-static.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -24,5 +24,5 @@
     and no Threads</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -30,5 +30,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/ppc64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/ppc64/gcc-final.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/cross-tools/ppc64/gcc-final.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -23,5 +23,5 @@
     <title>Installation of GCC Cross Compiler</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -29,5 +29,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/ppc64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/ppc64/gcc-static.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/cross-tools/ppc64/gcc-static.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -24,5 +24,5 @@
     and no Threads</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -30,5 +30,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/64/binutils.xml
===================================================================
--- BOOK/final-system/64/binutils.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/final-system/64/binutils.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -41,4 +41,12 @@
     href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/64/gcc.xml
===================================================================
--- BOOK/final-system/64/gcc.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/final-system/64/gcc.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -22,5 +22,5 @@
     <title>Installation of GCC</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -28,5 +28,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
 
Index: BOOK/final-system/common/binutils.xml
===================================================================
--- BOOK/final-system/common/binutils.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/final-system/common/binutils.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -39,4 +39,9 @@
     then the environment is not set up for proper PTY operation. This issue
     needs to be resolved before running the test suites for Binutils and GCC.</para>
+
+    <para os="p1">The following patch contains a number of updates to the
+    &binutils-version; branch by the Binutils developers:</para>
+
+    <screen os="p2"><userinput>patch -Np1 -i ../&binutils-branch_update-patch;</userinput></screen>
 
     <para os="g">The Binutils documentation recommends building Binutils outside of the
Index: BOOK/final-system/common/flex.xml
===================================================================
--- BOOK/final-system/common/flex.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/final-system/common/flex.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -25,9 +25,4 @@
   <sect2 role="installation">
     <title>Installation of Flex</title>
-
-    <para os="p1">The following patch contains fixes to generate proper
-    GCC 4.4.x code:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&flex-gcc44-patch;</userinput></screen>
 
     <para os="a">Prepare Flex for compilation:</para>
Index: BOOK/final-system/common/gcc.xml
===================================================================
--- BOOK/final-system/common/gcc.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/final-system/common/gcc.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -27,8 +27,8 @@
 
 
-<!--    <para os="p1">The following patch contains a number of updates to the 
+    <para os="p1">The following patch contains a number of updates to the 
     &gcc-version; branch by the GCC developers:</para>
 
-    <screen os="p2"><userinput>patch -Np1 -i ../&gcc-branch_update-patch;</userinput></screen> -->
+    <screen os="p2"><userinput>patch -Np1 -i ../&gcc-branch_update-patch;</userinput></screen>
 
     <para os="d">Apply a <command>sed</command> substitution that will suppress the
Index: BOOK/final-system/mips/gcc.xml
===================================================================
--- BOOK/final-system/mips/gcc.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/final-system/mips/gcc.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -22,5 +22,5 @@
     <title>Installation of GCC</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -28,5 +28,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/mips64-64/gcc.xml
===================================================================
--- BOOK/final-system/mips64-64/gcc.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/final-system/mips64-64/gcc.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -22,5 +22,5 @@
     <title>Installation of GCC</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -28,5 +28,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
 
Index: BOOK/final-system/mips64/binutils.xml
===================================================================
--- BOOK/final-system/mips64/binutils.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/final-system/mips64/binutils.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -41,4 +41,12 @@
     href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/mips64/gcc.xml
===================================================================
--- BOOK/final-system/mips64/gcc.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/final-system/mips64/gcc.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -22,5 +22,5 @@
     <title>Installation of GCC</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -28,5 +28,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/binutils.xml
===================================================================
--- BOOK/final-system/multilib/binutils.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/final-system/multilib/binutils.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -41,4 +41,12 @@
     href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/flex-64bit.xml
===================================================================
--- BOOK/final-system/multilib/flex-64bit.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/final-system/multilib/flex-64bit.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -21,12 +21,4 @@
   <sect2 role="installation">
     <title>Installation of Flex</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/flex-n32.xml
===================================================================
--- BOOK/final-system/multilib/flex-n32.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/final-system/multilib/flex-n32.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -21,12 +21,4 @@
   <sect2 role="installation">
     <title>Installation of Flex</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/flex.xml
===================================================================
--- BOOK/final-system/multilib/flex.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/final-system/multilib/flex.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -22,12 +22,4 @@
   <sect2 role="installation">
     <title>Installation of Flex</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/gcc.xml
===================================================================
--- BOOK/final-system/multilib/gcc.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/final-system/multilib/gcc.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -22,5 +22,5 @@
     <title>Installation of GCC</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -28,5 +28,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/ppc/gcc.xml
===================================================================
--- BOOK/final-system/ppc/gcc.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/final-system/ppc/gcc.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -22,5 +22,5 @@
     <title>Installation of GCC</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -28,5 +28,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/ppc64/gcc.xml
===================================================================
--- BOOK/final-system/ppc64/gcc.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/final-system/ppc64/gcc.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -22,5 +22,5 @@
     <title>Installation of GCC</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -28,5 +28,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/x86_64-64/binutils.xml
===================================================================
--- BOOK/final-system/x86_64-64/binutils.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/final-system/x86_64-64/binutils.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -41,4 +41,12 @@
     href="../common/binutils.xml"
     xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/materials/common/patches.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -29,4 +29,13 @@
 
     <varlistentry>
+      <term>Binutils Branch Update Patch - <token>&binutils-branch_update-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&binutils-branch_update-patch;"/></para>
+        <para>MD5 sum: <literal>&binutils-branch_update-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Coreutils Uname Patch - <token>&coreutils-uname-patch-size;</token>:</term>
       <listitem>
@@ -47,13 +56,4 @@
 
     <varlistentry>
-      <term>Flex GCC 4.4.x Patch - <token>&flex-gcc44-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&flex-gcc44-patch;"/></para>
-        <para>MD5 sum: <literal>&flex-gcc44-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-<!--
-    <varlistentry>
       <term>GCC Branch Update Patch - <token>&gcc-branch_update-patch-size;</token>:</term>
       <listitem>
@@ -63,5 +63,5 @@
       </listitem>
     </varlistentry>
--->
+
     <varlistentry>
       <term>Iana-Etc Protocol and Port Numbers Update - <token>&iana-etc-numbers_update-patch-size;</token>:</term>
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/packages.ent	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -44,8 +44,8 @@
 <!ENTITY binutils-home "http://sources.redhat.com/binutils">
 
-<!ENTITY bison-version "2.5">
-<!ENTITY bison-size "2,030 KB">
-<!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.bz2">
-<!ENTITY bison-md5 "9dba20116b13fc61a0846b0058fbe004">
+<!ENTITY bison-version "2.6.2">
+<!ENTITY bison-size "1.6 MB">
+<!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.xz">
+<!ENTITY bison-md5 "dea291996f98c34c3fd8e389a9cf6ea1">
 <!ENTITY bison-home "&gnu-software;bison">
 
@@ -75,8 +75,8 @@
 <!ENTITY colo-home "http://www.colonel-panic.org/cobalt-mips">
 
-<!ENTITY coreutils-version "8.16">
+<!ENTITY coreutils-version "8.19">
 <!ENTITY coreutils-size "4.9 MB">
 <!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.xz">
-<!ENTITY coreutils-md5 "89b06f91634208dceba7b36ad1f9e8b9">
+<!ENTITY coreutils-md5 "1a01231a2f3ed37c0efc073ccdda9375">
 <!ENTITY coreutils-home "&gnu-software;coreutils">
 
@@ -105,8 +105,8 @@
 <!ENTITY dvhtool-home "http://packages.qa.debian.org/d/dvhtool.html">
 
-<!ENTITY e2fsprogs-version "1.42.3">
-<!ENTITY e2fsprogs-size "5.6 MB">
+<!ENTITY e2fsprogs-version "1.42.5">
+<!ENTITY e2fsprogs-size "5.7 MB">
 <!ENTITY e2fsprogs-url "&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "73431146f58d40fe1375aba2060f0da8">
+<!ENTITY e2fsprogs-md5 "aca828bb4bcca20991a442deb950b670">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net">
 
@@ -152,8 +152,8 @@
 <!ENTITY findutils-home "&gnu-software;findutils">
 
-<!ENTITY flex-version "2.5.35">
-<!ENTITY flex-size "1,227 KB">
+<!ENTITY flex-version "2.5.37">
+<!ENTITY flex-size "1.3 MB">
 <!ENTITY flex-url "&sourceforge;flex/flex-&flex-version;.tar.bz2">
-<!ENTITY flex-md5 "10714e50cea54dc7a227e3eddcd44d57">
+<!ENTITY flex-md5 "c75940e1fc25108f2a7b3ef42abdae06">
 <!ENTITY flex-home "http://flex.sourceforge.net">
 
@@ -189,8 +189,8 @@
 <!ENTITY gmp-home "http://gmplib.org/">
 
-<!ENTITY grep-version "2.12">
-<!ENTITY grep-size "1,152 KB">
+<!ENTITY grep-version "2.14">
+<!ENTITY grep-size "1.2 MB">
 <!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.xz">
-<!ENTITY grep-md5 "8d2f0346d08b13c18afb81f0e8aa1e2f">
+<!ENTITY grep-md5 "d4a3f03849d1e17ce56ab76aa5a24cab">
 <!ENTITY grep-home "&gnu-software;grep">
 
@@ -201,8 +201,8 @@
 <!ENTITY groff-home "&gnu-software;groff">
 
-<!ENTITY grub-version "1.99">
-<!ENTITY grub-size "2,639 KB">
+<!ENTITY grub-version "2.00">
+<!ENTITY grub-size "5.0 MB">
 <!ENTITY grub-url "&gnu;grub/grub-&grub-version;.tar.xz">
-<!ENTITY grub-md5 "27e360b951f006c464299d06bbd63442">
+<!ENTITY grub-md5 "a1043102fbc7bcedbf53e7ee3d17ab91">
 <!ENTITY grub-home "&gnu-software;grub">
 
@@ -227,8 +227,8 @@
 
 
-<!ENTITY iproute2-version "3.3.0">
-<!ENTITY iproute2-size "372 KB">
+<!ENTITY iproute2-version "3.4.0">
+<!ENTITY iproute2-size "376 KB">
 <!ENTITY iproute2-url "&kernel;/linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "39a7ff2c5149475c710365954e2ce49b">
+<!ENTITY iproute2-md5 "879d3fac4e90809598b2864ec4a0cbf8">
 <!ENTITY iproute2-home "http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2">
 
@@ -245,8 +245,8 @@
 <!ENTITY kbd-home " ">
 
-<!ENTITY kmod-version "8">
-<!ENTITY kmod-size "964 KB">
+<!ENTITY kmod-version "9">
+<!ENTITY kmod-size "1.1 MB">
 <!ENTITY kmod-url "&kernel;/linux/utils/kernel/kmod/kmod-&kmod-version;.tar.xz">
-<!ENTITY kmod-md5 "d4e3d038b5370b1e8ff237c55666aa64">
+<!ENTITY kmod-md5 "c8ae2d2694fbca2b28e238b30543a0cd">
 <!ENTITY kmod-home "http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary">
 
@@ -277,8 +277,8 @@
 <!ENTITY linux-dl-version "3.0">
 
-<!ENTITY linux-version "3.3.7">
-<!ENTITY linux-size "77,112 KB">
-<!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2">
-<!ENTITY linux-md5 "6709647a7576c9e21b082f4d3d7a94cf">
+<!ENTITY linux-version "3.4.9">
+<!ENTITY linux-size "64 MB">
+<!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.xz">
+<!ENTITY linux-md5 "052fca5bca4165bf3d2cfec7f3658e5a">
 <!ENTITY linux-home "http://www.kernel.org">
 
@@ -301,20 +301,20 @@
 <!ENTITY man-home "http://primates.ximian.com/~flucifredi/man">
 
-<!ENTITY man-pages-version "3.41">
-<!ENTITY man-pages-size "1,068 KB">
+<!ENTITY man-pages-version "3.42">
+<!ENTITY man-pages-size "1.1 MB">
 <!ENTITY man-pages-url "&kernel;/linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "7395d284fa1b9e112006d736865781b0">
+<!ENTITY man-pages-md5 "2392bb23db94f344f493c4beca41398f">
 <!ENTITY man-pages-home "http://www.win.tue.nl/~aeb/linux/man">
 
-<!ENTITY mpc-version "0.9">
-<!ENTITY mpc-size "556 KB">
+<!ENTITY mpc-version "1.0">
+<!ENTITY mpc-size "616 KB">
 <!ENTITY mpc-url "http://www.multiprecision.org/mpc/download/mpc-&mpc-version;.tar.gz">
-<!ENTITY mpc-md5 "0d6acab8d214bd7d1fbbc593e83dd00d">
+<!ENTITY mpc-md5 "13370ceb2e266c5eeb2f7e78c24b7858">
 <!ENTITY mpc-home "http://www.multiprecision.org/">
 
-<!ENTITY mpfr-version "3.1.0">
-<!ENTITY mpfr-size "1,083 KB">
-<!ENTITY mpfr-url "http://www.mpfr.org/mpfr-&mpfr-version;/mpfr-&mpfr-version;.tar.bz2">
-<!ENTITY mpfr-md5 "6e495841bb026481567006cec0f821c3">
+<!ENTITY mpfr-version "3.1.1">
+<!ENTITY mpfr-size "1.1 MB">
+<!ENTITY mpfr-url "http://www.mpfr.org/mpfr-&mpfr-version;/mpfr-&mpfr-version;.tar.xz">
+<!ENTITY mpfr-md5 "91d51c41fcf2799e4ee7a7126fc95c17">
 <!ENTITY mpfr-home "http://www.mpfr.org/">
 
@@ -337,14 +337,14 @@
 <!ENTITY patch-home "http://savannah.gnu.org/projects/patch">
 
-<!ENTITY perl-version "5.14.2">
-<!ENTITY perl-size "13,250 KB">
-<!ENTITY perl-url "http://www.cpan.org/src/5.0/perl-&perl-version;.tar.bz2">
-<!ENTITY perl-md5 "04a4c5d3c1f9f19d77daff8e8cd19a26">
+<!ENTITY perl-version "5.16.1">
+<!ENTITY perl-size "16 MB">
+<!ENTITY perl-url "http://www.cpan.org/src/5.0/perl-&perl-version;.tar.gz">
+<!ENTITY perl-md5 "bcc5136007177b0fe2b6fd739fb66b84">
 <!ENTITY perl-home "http://www.perl.org">
 
-<!ENTITY pkg-config-version "0.26">
+<!ENTITY pkg-config-version "lite-0.27-1">
 <!ENTITY pkg-config-size "388 KB">
 <!ENTITY pkg-config-url "http://pkgconfig.freedesktop.org/releases/pkg-config-&pkg-config-version;.tar.gz">
-<!ENTITY pkg-config-md5 "47525c26a9ba7ba14bf85e01509a7234">
+<!ENTITY pkg-config-md5 "7e7e64cf1185622c3c331914ccc90b33">
 <!ENTITY pkg-config-home "http://pkgconfig.freedesktop.org/wiki/">
 
@@ -355,8 +355,8 @@
 <!ENTITY powerpcutils-home "http://packages.qa.debian.org/p/powerpc-utils.html">
 
-<!ENTITY ppl-version "0.11.2">
+<!ENTITY ppl-version "0.12.1">
 <!ENTITY ppl-size "12,060 KB">
 <!ENTITY ppl-url "ftp://ftp.cs.unipr.it/pub/ppl/releases/&ppl-version;/ppl-&ppl-version;.tar.bz2">
-<!ENTITY ppl-md5 "c24429e6c3bc97d45976a63f40f489a1">
+<!ENTITY ppl-md5 "8da3ab9de18e669b7af8c4707817d468">
 <!ENTITY ppl-home "http://bugseng.com/products/ppl/">
 
@@ -367,8 +367,8 @@
 <!ENTITY procps-home "http://procps.sourceforge.net">
 
-<!ENTITY psmisc-version "22.17">
-<!ENTITY psmisc-size "492 KB">
+<!ENTITY psmisc-version "22.19">
+<!ENTITY psmisc-size "484 KB">
 <!ENTITY psmisc-url "&sourceforge;psmisc/psmisc-&psmisc-version;.tar.gz">
-<!ENTITY psmisc-md5 "634e0f7c3b3dde22ea879e6279c9ec61">
+<!ENTITY psmisc-md5 "38563b4760ffce54b0eadf99cb5b16e8">
 <!ENTITY psmisc-home "http://psmisc.sourceforge.net">
 
@@ -380,8 +380,8 @@
 <!ENTITY readline-home "http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html">
 
-<!ENTITY rsyslog-version "6.2.0">
-<!ENTITY rsyslog-size "2,336 KB">
+<!ENTITY rsyslog-version "6.2.2">
+<!ENTITY rsyslog-size "2.4 MB">
 <!ENTITY rsyslog-url "http://www.rsyslog.com/files/download/rsyslog/rsyslog-&rsyslog-version;.tar.gz">
-<!ENTITY rsyslog-md5 "03e237abaa5d47f92c6e655f92f22532">
+<!ENTITY rsyslog-md5 "b797b8222d6ea4d5dfa007efe8aafa7f">
 <!ENTITY rsyslog-home "http://www.rsyslog.com/">
 
@@ -392,8 +392,8 @@
 <!ENTITY sed-home "&gnu-software;sed">
 
-<!ENTITY shadow-version "4.1.5">
+<!ENTITY shadow-version "4.1.5.1">
 <!ENTITY shadow-size "2.1 MB">
 <!ENTITY shadow-url "http://pkg-shadow.alioth.debian.org/releases/shadow-&shadow-version;.tar.bz2">
-<!ENTITY shadow-md5 "03e237abaa5d47f92c6e655f92f22532">
+<!ENTITY shadow-md5 "a00449aa439c69287b6d472191dc2247">
 <!ENTITY shadow-home "http://pkg-shadow.alioth.debian.org">
 
@@ -441,9 +441,9 @@
 <!ENTITY uname_hack-home " ">
 
-<!ENTITY util-linux-major-version "2.20">
-<!ENTITY util-linux-version "&util-linux-major-version;.1">
-<!ENTITY util-linux-size "4,508 KB">
-<!ENTITY util-linux-url "&kernel;/linux/utils/util-linux/v&util-linux-major-version;/util-linux-&util-linux-version;.tar.bz2">
-<!ENTITY util-linux-md5 "079b37517fd4e002a2e6e992e8b4e361">
+<!ENTITY util-linux-major-version "2.21">
+<!ENTITY util-linux-version "&util-linux-major-version;.2">
+<!ENTITY util-linux-size "2.9 MB">
+<!ENTITY util-linux-url "&kernel;/linux/utils/util-linux/v&util-linux-major-version;/util-linux-&util-linux-version;.tar.xz">
+<!ENTITY util-linux-md5 "54ba880f1d66782c2287ee2c898520e9">
 <!ENTITY util-linux-blkid-id "1.1.0">
 <!ENTITY util-linux-uuid-id "1.3.0">
@@ -457,8 +457,8 @@
 <!ENTITY vim-home "http://www.vim.org">
 
-<!ENTITY xz-version "5.0.3">
-<!ENTITY xz-size "880 KB">
-<!ENTITY xz-url "http://tukaani.org/xz/xz-&xz-version;.tar.bz2">
-<!ENTITY xz-md5 "bec7f7985dd79f97aa10ff8305a3a770">
+<!ENTITY xz-version "5.0.4">
+<!ENTITY xz-size "896 KB">
+<!ENTITY xz-url "http://tukaani.org/xz/xz-&xz-version;.tar.xz">
+<!ENTITY xz-md5 "161015c4a65b1f293d31810e1df93090">
 <!ENTITY xz-home "http://tukaani.org/xz/">
 
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/patches.ent	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -9,11 +9,11 @@
 <!ENTITY bash-branch_update-patch-size "56 KB">
 
+<!ENTITY binutils-branch_update-patch "binutils-&binutils-version;-branch_update-1.patch">
+<!ENTITY binutils-branch_update-patch-md5 "4fcdd8ef88fe07db8616e91a14bc5ac8">
+<!ENTITY binutils-branch_update-patch-size "5.2 MB">
+
 <!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname-1.patch">
 <!ENTITY coreutils-uname-patch-md5 "5c1fd41bb1e59f1627cebd9c0451cd74">
 <!ENTITY coreutils-uname-patch-size "16 KB">
-
-<!ENTITY flex-gcc44-patch "flex-&flex-version;-gcc44-1.patch">
-<!ENTITY flex-gcc44-patch-md5 "a6ffbba93d034380e12110bb6d399113">
-<!ENTITY flex-gcc44-patch-size "12 KB">
 
 <!ENTITY eglibc-fixes-patch "eglibc-&eglibc-version;-fixes-1.patch">
@@ -26,6 +26,6 @@
 
 <!ENTITY gcc-branch_update-patch "gcc-&gcc-version;-branch_update-1.patch">
-<!ENTITY gcc-branch_update-patch-md5 "3ff1f39dc12932736694bf6fb6a1846a">
-<!ENTITY gcc-branch_update-patch-size "1.5 MB">
+<!ENTITY gcc-branch_update-patch-md5 "9bd091c9669328a5d835757bc89c02b9">
+<!ENTITY gcc-branch_update-patch-size "252 KB">
 
 <!ENTITY iana-etc-get_fix-patch "iana-etc-&iana-etc-version;-get_fix-1.patch">
@@ -58,7 +58,7 @@
 <!ENTITY ncurses-bashfix-patch-size "4 KB">
 
-<!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update-3.patch">
+<!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update-4.patch">
 <!ENTITY ncurses-branch_update-patch-md5 "5f8be727e09d39784c7f6088c3489237">
-<!ENTITY ncurses-branch_update-patch-size "1.8 MB">
+<!ENTITY ncurses-branch_update-patch-size "2.5 MB">
 
 <!ENTITY patch-test-patch "patch-&patch-version;-test_fix-1.patch">
@@ -67,6 +67,6 @@
 
 <!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
-<!ENTITY perl-libc-patch-md5 "6efb1ffa5a6961c239024c445e0adc9a">
-<!ENTITY perl-libc-patch-size "4 KB">
+<!ENTITY perl-libc-patch-md5 "2adb1094aa7230bfcc7a6b6fc5e14416">
+<!ENTITY perl-libc-patch-size "20 KB">
 
 <!ENTITY procps-ps_cgroup-patch "procps-&procps-version;-ps_cgroup-1.patch">
@@ -97,10 +97,10 @@
 
 <!ENTITY iproute2-libdir-patch "iproute2-&iproute2-version;-libdir-1.patch">
-<!ENTITY iproute2-libdir-patch-md5 "b901c549615739b28db8b4a2126049ce">
-<!ENTITY iproute2-libdir-patch-size "4 KB">
+<!ENTITY iproute2-libdir-patch-md5 "0b7174fdb8de7605ead1a8a61efe0eff">
+<!ENTITY iproute2-libdir-patch-size "8.0 KB">
 
 <!ENTITY perl-multilib-patch "perl-&perl-version;-Configure_multilib-1.patch">
-<!ENTITY perl-multilib-patch-md5 "1dd7df742630213d55c0749948baa9b9">
-<!ENTITY perl-multilib-patch-size "4 KB">
+<!ENTITY perl-multilib-patch-md5 "218c4a01d586eb4bf8496888d45e49f0">
+<!ENTITY perl-multilib-patch-size "560 KB">
 
 <!-- Start of Pure64 patches -->
Index: BOOK/temp-system/64/binutils.xml
===================================================================
--- BOOK/temp-system/64/binutils.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/temp-system/64/binutils.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of Binutils</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/64/gcc.xml
===================================================================
--- BOOK/temp-system/64/gcc.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/temp-system/64/gcc.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -23,5 +23,5 @@
     <title>Installation of GCC</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/64/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -29,5 +29,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/common/binutils.xml
===================================================================
--- BOOK/temp-system/common/binutils.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/temp-system/common/binutils.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of Binutils</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/common/flex.xml
===================================================================
--- BOOK/temp-system/common/flex.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/temp-system/common/flex.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -22,12 +22,4 @@
   <sect2 role="installation">
     <title>Installation of Flex</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/flex.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <para os="t3">When cross compiling, the <command>configure</command>
Index: BOOK/temp-system/common/gcc.xml
===================================================================
--- BOOK/temp-system/common/gcc.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/temp-system/common/gcc.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -23,5 +23,5 @@
     <title>Installation of GCC</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/common/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -29,5 +29,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/mips/gcc.xml
===================================================================
--- BOOK/temp-system/mips/gcc.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/temp-system/mips/gcc.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -23,5 +23,5 @@
     <title>Installation of GCC</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/common/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -29,5 +29,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/mips64-64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64-64/gcc.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/temp-system/mips64-64/gcc.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -23,5 +23,5 @@
     <title>Installation of GCC</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/64/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -29,5 +29,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/mips64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64/gcc.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/temp-system/mips64/gcc.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -23,5 +23,5 @@
     <title>Installation of GCC</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -29,5 +29,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/multilib/binutils.xml
===================================================================
--- BOOK/temp-system/multilib/binutils.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/temp-system/multilib/binutils.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of Binutils</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/binutils.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/multilib/flex.xml
===================================================================
--- BOOK/temp-system/multilib/flex.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/temp-system/multilib/flex.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -22,12 +22,4 @@
   <sect2 role="installation">
     <title>Installation of Flex</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(//*[@os='p1'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(//*[@os='p2'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/multilib/gcc.xml
===================================================================
--- BOOK/temp-system/multilib/gcc.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/temp-system/multilib/gcc.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -23,5 +23,5 @@
     <title>Installation of GCC</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -29,5 +29,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/temp-system/ppc/gcc.xml
===================================================================
--- BOOK/temp-system/ppc/gcc.xml	(revision 0344bf169c4f0e07bb591f385a07f1453ade937f)
+++ BOOK/temp-system/ppc/gcc.xml	(revision 3e0fdeb93780e20d63c9afea67c1849634c4f728)
@@ -23,5 +23,5 @@
     <title>Installation of GCC</title>
 
-<!--    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/common/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
@@ -29,5 +29,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/> -->
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
