Index: BOOK/cross-tools/common/cloog-ppl.xml
===================================================================
--- BOOK/cross-tools/common/cloog-ppl.xml	(revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/cross-tools/common/cloog-ppl.xml	(revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -37,5 +37,5 @@
 <screen os="b"><userinput>LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
     ./configure --prefix=/cross-tools --enable-shared --with-bits=gmp \
-	--with-gmp=/cross-tools --with-ppl=/cross-tools</userinput></screen>
+    --with-gmp=/cross-tools --with-ppl=/cross-tools</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/cross-tools/common/ppl.xml
===================================================================
--- BOOK/cross-tools/common/ppl.xml	(revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/cross-tools/common/ppl.xml	(revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -37,6 +37,7 @@
 <screen os="b"><userinput>LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
     ./configure --prefix=/cross-tools --enable-shared \
-        --enable-interfaces="c,cxx" \
-	--with-libgmp-prefix=/cross-tools --with-libgmpxx-prefix=/cross-tools</userinput></screen>
+    --enable-interfaces="c,cxx" \
+    --with-libgmp-prefix=/cross-tools \
+    --with-libgmpxx-prefix=/cross-tools</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/cloog-ppl.xml
===================================================================
--- BOOK/final-system/common/cloog-ppl.xml	(revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/final-system/common/cloog-ppl.xml	(revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -32,6 +32,6 @@
 
 <screen os="b"><userinput>CC="gcc -isystem /usr/include" LDFLAGS="-Wl,-rpath-link,/lib" \
-    ./configure --prefix=/usr --enable-shared --with-gmp=/usr \
-	--with-ppl=/usr</userinput></screen>
+    ./configure --prefix=/usr --enable-shared --with-gmp \
+    --with-ppl</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/common/iproute2.xml
===================================================================
--- BOOK/final-system/common/iproute2.xml	(revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/final-system/common/iproute2.xml	(revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -38,5 +38,5 @@
     <para os="a">Compile the package:</para>
 
-<screen os="b"><userinput>make DESTDIR=/ DOCDIR=/usr/share/doc/iproute2 \
+<screen os="b"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
     MANDIR=/usr/share/man</userinput></screen>
 
@@ -45,5 +45,5 @@
 
       <varlistentry>
-        <term><parameter>DESTDIR=/</parameter></term>
+        <term><parameter>DESTDIR=</parameter></term>
         <listitem>
           <para>This option overrides the default DESTDIR of /usr, so that
@@ -69,5 +69,5 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DOCDIR=/usr/share/doc/iproute2 \
+<screen os="f"><userinput>make DESTDIR= DOCDIR=/usr/share/doc/iproute2 \
     MANDIR=/usr/share/man install</userinput></screen>
 
Index: BOOK/final-system/common/ppl.xml
===================================================================
--- BOOK/final-system/common/ppl.xml	(revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/final-system/common/ppl.xml	(revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -30,7 +30,8 @@
     <para os="a">Prepare PPL for compilation:</para>
 
-<screen os="b"><userinput>CC="gcc -isystem /usr/include" LDFLAGS="-Wl,-rpath-link,/lib" \
-    ./configure --prefix=/usr --enable-shared --with-libgmp-prefix=/usr \
-    --with-libgmpxx-prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include" \
+    CXX="g++ -isystem /usr/include" \
+    LDFLAGS="-Wl,-rpath-link,/lib" \
+    ./configure --prefix=/usr --enable-shared</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/final-system/mips64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-chapter.xml	(revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/final-system/mips64-chapter.xml	(revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -30,5 +30,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ppl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ppl-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ppl-64bit.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/ppl-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/cloog-ppl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/cloog-ppl-n32.xml"/>
Index: BOOK/final-system/mips64/ppl-64bit.xml
===================================================================
--- BOOK/final-system/mips64/ppl-64bit.xml	(revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
+++ BOOK/final-system/mips64/ppl-64bit.xml	(revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-system-ppl" role="wrap">
+  <?dbhtml filename="ppl-64bit.html"?>
+
+  <title>PPL-&ppl-version; 64 Bit</title>
+
+  <indexterm zone="ch-system-ppl">
+    <primary sortas="a-PPL">PPL</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/ppl.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of PPL</title>
+
+<!--
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ppl.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ppl.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+ -->
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ppl.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/ppl-64bit.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ppl.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ppl.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ppl.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ppl.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ppl.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ppl.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/ppl.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/ppl-64bit.xml"
+    xpointer="xpointer(//*[@os='m1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/ppl-64bit.xml"
+    xpointer="xpointer(//*[@os='m2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/ppl-64bit.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/ppl-64bit.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <para os="l">Finally, create a stub header in the place of the originals:</para>
+
+<screen os="m"><userinput>cat &gt; /usr/include/ppl.h &lt;&lt; "EOF"
+/* ppl.hh - Stub Header  */
+#ifndef __STUB__PPL_HH__
+#define __STUB__PPL_HH__
+
+#include &lt;sgidefs.h&gt;
+
+#if (_MIPS_SIM == _ABIO32)
+# include "ppl-32.hh"
+#elif (_MIPS_SIM == _ABIN32)
+# include "ppl-n32.hh"
+#elif (_MIPS_SIM == _ABI64)
+# include "ppl-64.hh"
+#endif
+
+#endif /* __STUB__PPL_HH__ */
+EOF</userinput></screen>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/ppl.xml"
+  xpointer="xpointer(id('contents-ppl'))"/>
+
+</sect1>
Index: BOOK/final-system/multilib/cloog-ppl-64bit.xml
===================================================================
--- BOOK/final-system/multilib/cloog-ppl-64bit.xml	(revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/final-system/multilib/cloog-ppl-64bit.xml	(revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -38,6 +38,6 @@
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
     LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" ./configure --prefix=/usr \
-	--libdir=/usr/lib64 --enable-shared --with-gmp=/usr \
-    --with-ppl=/usr</userinput></screen>
+    --libdir=/usr/lib64 --enable-shared --with-gmp \
+    --with-ppl</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/cloog-ppl-n32.xml
===================================================================
--- BOOK/final-system/multilib/cloog-ppl-n32.xml	(revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/final-system/multilib/cloog-ppl-n32.xml	(revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -37,8 +37,8 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
+<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDM32}" \
     LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" ./configure --prefix=/usr \
-	--libdir=/usr/lib32 --enable-shared \
-    --with-libgmp-prefix=/usr --with-libgmpxx-prefix=/usr</userinput></screen>
+    --libdir=/usr/lib32 --enable-shared --with-gmp \
+    --with-ppl</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/cloog-ppl.xml
===================================================================
--- BOOK/final-system/multilib/cloog-ppl.xml	(revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/final-system/multilib/cloog-ppl.xml	(revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -39,6 +39,6 @@
 <screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
     LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" ./configure --prefix=/usr \
-	--host=${CLFS_TARGET32} --enable-shared \
-    --with-gmp=/usr --with-ppl=/usr</userinput></screen>
+    --host=${CLFS_TARGET32} --enable-shared \
+    --with-gmp --with-ppl</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/iproute2.xml
===================================================================
--- BOOK/final-system/multilib/iproute2.xml	(revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/final-system/multilib/iproute2.xml	(revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -38,5 +38,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR=/ LIBDIR=/usr/lib64 \
+<screen os="b"><userinput>make CC="gcc ${BUILD64}" DESTDIR= LIBDIR=/usr/lib64 \
     DOCDIR=/usr/share/doc/iproute2 MANDIR=/usr/share/man</userinput></screen>
 
@@ -53,5 +53,5 @@
     xpointer="xpointer(//*[@os='e'])"/>
 
-<screen os="f"><userinput>make LIBDIR=/usr/lib64 \
+<screen os="f"><userinput>make DESTDIR= LIBDIR=/usr/lib64 \
     DOCDIR=/usr/share/doc/iproute2 \
     MANDIR=/usr/share/man install</userinput></screen>
Index: BOOK/final-system/multilib/ppl-64bit.xml
===================================================================
--- BOOK/final-system/multilib/ppl-64bit.xml	(revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/final-system/multilib/ppl-64bit.xml	(revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -36,8 +36,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD64}" \
-    LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" ./configure --prefix=/usr \
-	--libdir=/usr/lib64 --enable-shared \
-    --with-libgmp-prefix=/usr --with-libgmpxx-prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILD64}" \
+    CXX="g++ -isystem /usr/include ${BUILD64}" \
+    LDFLAGS="-Wl,-rpath-link,/lib64 ${BUILD64}" \
+    ./configure --prefix=/usr \
+    --libdir=/usr/lib64 --enable-shared</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -69,4 +70,34 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <para os="m1">Prepare <filename>ppl-config</filename> to be wrapped by
+    the multiarch wrapper and then wrap it:</para>
+
+<screen os="m2"><userinput>mv -v /usr/bin/ppl-config{,-64}
+ln -svf multiarch_wrapper /usr/bin/ppl-config</userinput></screen>
+
+    <para os="j">Create the 64bit header file:</para>
+
+<screen os="k"><userinput>mv -v /usr/include/ppl{,-64}.hh</userinput></screen>
+
+    <para os="l">Finally, create a stub header in the place of the originals:</para>
+
+<screen os="m"><userinput>cat &gt; /usr/include/ppl.hh &lt;&lt; "EOF"
+/* ppl.hh - Stub Header  */
+#ifndef __STUB__PPL_HH__
+#define __STUB__PPL_HH__
+
+#if defined(__x86_64__) || \
+    defined(__sparc64__) || \
+    defined(__arch64__) || \
+    defined(__powerpc64__) || \
+    defined (__s390x__)
+# include "ppl-64.h"
+#else
+# include "ppl-32.h"
+#endif
+
+#endif /* __STUB__PPL_HH__ */
+EOF</userinput></screen>
+
   </sect2>
 
Index: BOOK/final-system/multilib/ppl-n32.xml
===================================================================
--- BOOK/final-system/multilib/ppl-n32.xml	(revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/final-system/multilib/ppl-n32.xml	(revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -37,8 +37,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILDN32}" \
-    LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" ./configure --prefix=/usr \
-	--libdir=/usr/lib32 --enable-shared --with-libgmp-prefix=/usr \
-    --with-libgmpxx-prefix=/usr</userinput></screen>
+<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILDN32}" \
+    CXX="g++ -isystem /usr/include ${BUILDN32}" \
+    LDFLAGS="-Wl,-rpath-link,/lib32 ${BUILDN32}" \
+    ./configure --prefix=/usr \
+    --libdir=/usr/lib32 --enable-shared</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -70,4 +71,14 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="ppl.xml"
+    xpointer="xpointer(//*[@os='m1'])"/>
+
+<screen os="m2"><userinput>mv -v /usr/bin/ppl-config{,-n32}</userinput></screen>
+
+    <para os="j">Create the N32 header file:</para>
+
+<screen os="k"><userinput>mv -v /usr/include/ppl{,-n32}.hh</userinput></screen>
+
   </sect2>
 
Index: BOOK/final-system/multilib/ppl.xml
===================================================================
--- BOOK/final-system/multilib/ppl.xml	(revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/final-system/multilib/ppl.xml	(revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -37,8 +37,9 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc -isystem /usr/include ${BUILD32}" \
+<screen os="b"><userinput>CPPFLAGS=-fexceptions CC="gcc -isystem /usr/include ${BUILD32}" \
+    CXX="g++ -isystem /usr/include ${BUILD32}" \
     LDFLAGS="-Wl,-rpath-link,/lib ${BUILD32}" \
-	./configure --prefix=/usr --host=${CLFS_TARGET32} --enable-shared \
-	--with-libgmp-prefix=/usr --with-libgmpxx-prefix=/usr</userinput></screen>
+    ./configure --prefix=/usr --host=${CLFS_TARGET32} \
+    --enable-shared</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -70,4 +71,14 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
+    <para os="m1">Prepare <filename>ppl-config</filename> to be wrapped by
+    the multiarch wrapper:</para>
+
+<screen os="m2"><userinput>mv -v /usr/bin/ppl-config{,-32}</userinput></screen>
+
+    <para os="j">One of the headers installed by PPL is architecture specific. Programs compiled as 32bit will require the header provided by the 32bit installation of PPL. The same applies for 64bit programs. Move the header so a wrapper can be put in its place later:</para>
+
+<screen os="k"><userinput>mv -v /usr/include/ppl{,-32}.hh</userinput></screen>
+
+
   </sect2>
 
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/patches.ent	(revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY patches-root "http://svn.cross-lfs.org/svn/repos/cross-lfs/trunk/patches/">
+<!ENTITY patches-root "http://cross-lfs.org/files/packages/svn/">
 
 <!-- Start of Common Patches -->
Index: BOOK/temp-system/64/cloog-ppl.xml
===================================================================
--- BOOK/temp-system/64/cloog-ppl.xml	(revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/temp-system/64/cloog-ppl.xml	(revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -38,6 +38,6 @@
 
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-  --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-bits=gmp \
-  --enable-shared --with-gmp=/tools --with-ppl=/tools</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-bits=gmp \
+    --enable-shared --with-gmp=/tools --with-ppl=/tools</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/64/gcc.xml
===================================================================
--- BOOK/temp-system/64/gcc.xml	(revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/temp-system/64/gcc.xml	(revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -123,11 +123,4 @@
     xpointer="xpointer(//*[@os='cp'])"/>
 
-   <para os="dp">Now we copy the files that are placed in <filename class="directory">/tools/lib64
-   </filename> to <filename class="directory">/tools/lib</filename>.
-    We also delete the /tools/lib64 directory:</para>
-
-<screen os="dq"><userinput>cp -va /tools/lib64/* /tools/lib
-rm -rvf /tools/lib64</userinput></screen>
-
   </sect2>
 
Index: BOOK/temp-system/common/cloog-ppl.xml
===================================================================
--- BOOK/temp-system/common/cloog-ppl.xml	(revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/temp-system/common/cloog-ppl.xml	(revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -36,6 +36,6 @@
 
 <screen os="b"><userinput>./configure --prefix=/tools \
-  --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-bits=gmp \
-  --with-ppl=/tools --with-gmp=/tools</userinput></screen>
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-bits=gmp \
+    --with-ppl=/tools --with-gmp=/tools</userinput></screen>
 
     <para os="c">Compile the package:</para>
Index: BOOK/temp-system/common/gcc.xml
===================================================================
--- BOOK/temp-system/common/gcc.xml	(revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/temp-system/common/gcc.xml	(revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -98,9 +98,6 @@
     </variablelist>
 
-    <para os="ts1">When gcc was configured it was told to find MPFR, GMP, PPL,
-    and CLooG-PPL in /tools. However, when compiling gcc uses these same values
-    for building native helper programs that run on the host. The following sed
-    will change those values to look in cross-tools for the native programs
-    only:</para>
+    <para os="ts1">The following will prevent GCC from looking in the wrong
+    directories for headers and libraries:</para>
 
 <screen os="ts2"><userinput>cp Makefile{,.orig}
Index: BOOK/temp-system/common/ppl.xml
===================================================================
--- BOOK/temp-system/common/ppl.xml	(revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/temp-system/common/ppl.xml	(revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -37,6 +37,6 @@
 <screen os="b"><userinput>./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-     --enable-interfaces="c,cxx" \
-	--with-libgmp-prefix=/tools --with-libgmpxx-prefix=/tools</userinput></screen>
+    --enable-interfaces="c,cxx" \
+    --with-libgmp-prefix=/tools --with-libgmpxx-prefix=/tools</userinput></screen>
 
     <para os="bp1">PPL doesn't check to see if GMP was compiled with support for
Index: BOOK/temp-system/multilib/ppl.xml
===================================================================
--- BOOK/temp-system/multilib/ppl.xml	(revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/temp-system/multilib/ppl.xml	(revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -39,6 +39,6 @@
 <screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
     --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-      --enable-interfaces="c,cxx" --libdir=/tools/lib64 --enable-shared \
-      --with-libgmp-prefix=/tools --with-libgmpxx-prefix=/tools</userinput></screen>
+    --enable-interfaces="c,cxx" --libdir=/tools/lib64 --enable-shared \
+    --with-libgmp-prefix=/tools --with-libgmpxx-prefix=/tools</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/ppc64-chapter.xml
===================================================================
--- BOOK/temp-system/ppc64-chapter.xml	(revision 426165997542339fad1aa3f431a0c840758ba917)
+++ BOOK/temp-system/ppc64-chapter.xml	(revision 6fcaedee53408e55bc286215aa3dbbaa99a9f78c)
@@ -38,6 +38,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/vim.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/choose.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/xz.xml"/>
 
 </chapter>
