Index: BOOK/cross-tools/64/eglibc.xml
===================================================================
--- BOOK/cross-tools/64/eglibc.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/cross-tools/64/eglibc.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -137,4 +137,12 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>
 
Index: BOOK/cross-tools/alpha/eglibc.xml
===================================================================
--- BOOK/cross-tools/alpha/eglibc.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/cross-tools/alpha/eglibc.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -91,4 +91,12 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>
 
Index: BOOK/cross-tools/common/eglibc.xml
===================================================================
--- BOOK/cross-tools/common/eglibc.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/cross-tools/common/eglibc.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -187,4 +187,12 @@
 	installed on the host system</para>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+<screen os="rb"><userinput>cp -v ../eglibc-&eglibc-version;/sunrpc/rpc/*.h /tools/include/rpc
+cp -v ../eglibc-&eglibc-version;/sunrpc/rpcsvc/*.h /tools/include/rpcsvc
+cp -v ../eglibc-&eglibc-version;/nis/rpcsvc/*.h /tools/include/rpcsvc</userinput></screen>
+
   </sect2>
 
Index: BOOK/cross-tools/mips/eglibc.xml
===================================================================
--- BOOK/cross-tools/mips/eglibc.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/cross-tools/mips/eglibc.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -99,4 +99,12 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>
 
Index: BOOK/cross-tools/mips64-64/eglibc.xml
===================================================================
--- BOOK/cross-tools/mips64-64/eglibc.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/cross-tools/mips64-64/eglibc.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -107,4 +107,12 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>
 
Index: BOOK/cross-tools/mips64/eglibc-64bit.xml
===================================================================
--- BOOK/cross-tools/mips64/eglibc-64bit.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/cross-tools/mips64/eglibc-64bit.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -115,4 +115,12 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>
 
Index: BOOK/cross-tools/multilib/eglibc-64bit.xml
===================================================================
--- BOOK/cross-tools/multilib/eglibc-64bit.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/cross-tools/multilib/eglibc-64bit.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -117,4 +117,12 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>
 
Index: BOOK/cross-tools/ppc/eglibc.xml
===================================================================
--- BOOK/cross-tools/ppc/eglibc.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/cross-tools/ppc/eglibc.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -95,4 +95,12 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>
 
Index: BOOK/cross-tools/ppc64/eglibc-64bit.xml
===================================================================
--- BOOK/cross-tools/ppc64/eglibc-64bit.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/cross-tools/ppc64/eglibc-64bit.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -99,4 +99,12 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>
 
Index: BOOK/cross-tools/sparc64-64/eglibc.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/eglibc.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/cross-tools/sparc64-64/eglibc.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -91,4 +91,12 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
     <para os="do">The stubs.h header installed by eglibc looks for stubs-32.h
     and stubs-64.h. This configuration of eglibc only generates stubs-64.h. Fix
Index: BOOK/cross-tools/sparc64/eglibc-64bit.xml
===================================================================
--- BOOK/cross-tools/sparc64/eglibc-64bit.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/cross-tools/sparc64/eglibc-64bit.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -103,4 +103,12 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>
 
Index: BOOK/cross-tools/x86/eglibc.xml
===================================================================
--- BOOK/cross-tools/x86/eglibc.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/cross-tools/x86/eglibc.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -154,4 +154,12 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>
 
Index: BOOK/final-system/alpha/eglibc.xml
===================================================================
--- BOOK/final-system/alpha/eglibc.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/final-system/alpha/eglibc.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -118,4 +118,12 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>
 
Index: BOOK/final-system/common/eglibc.xml
===================================================================
--- BOOK/final-system/common/eglibc.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/final-system/common/eglibc.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -152,4 +152,10 @@
 
 <screen os="t"><userinput>make install</userinput></screen>
+
+    <para os="ra">Install NIS and RPC related headers that are not installed by default.</para>
+
+<screen os="rb"><userinput>cp -v ../eglibc-&eglibc-version;/sunrpc/rpc/*.h /usr/include/rpc
+cp -v ../eglibc-&eglibc-version;/sunrpc/rpcsvc/*.h /usr/include/rpcsvc
+cp -v ../eglibc-&eglibc-version;/nis/rpcsvc/*.h /usr/include/rpcsvc</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/mips/eglibc.xml
===================================================================
--- BOOK/final-system/mips/eglibc.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/final-system/mips/eglibc.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -126,4 +126,12 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>
 
Index: BOOK/final-system/mips64-64/eglibc.xml
===================================================================
--- BOOK/final-system/mips64-64/eglibc.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/final-system/mips64-64/eglibc.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -148,4 +148,12 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>
 
Index: BOOK/final-system/mips64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/mips64/eglibc-64bit.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/final-system/mips64/eglibc-64bit.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -128,4 +128,12 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>
 
Index: BOOK/final-system/mips64/eglibc.xml
===================================================================
--- BOOK/final-system/mips64/eglibc.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/final-system/mips64/eglibc.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -42,12 +42,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/eglibc.xml"
-    xpointer="xpointer(//*[@os='l5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/eglibc.xml"
-    xpointer="xpointer(//*[@os='l6'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/multilib/eglibc-64bit.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/final-system/multilib/eglibc-64bit.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -123,4 +123,12 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>
 
Index: BOOK/final-system/multilib/eglibc.xml
===================================================================
--- BOOK/final-system/multilib/eglibc.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/final-system/multilib/eglibc.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -42,8 +42,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
-
-    <para os="l5">RPC headers are not installed at /tools/include/rpc. Eglibc 32 bit build will get into a bad state due to the new rpc helpers that get cross-compiled. We do not want this, so the following command will use the internal rpc types header.</para>
-
-<screen os="l6"><userinput>sed -i 's/&lt;rpc\/types.h&gt;/"rpc\/types.h"/' sunrpc/rpc_clntout.c</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/ppc/eglibc.xml
===================================================================
--- BOOK/final-system/ppc/eglibc.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/final-system/ppc/eglibc.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -118,4 +118,12 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>
 
Index: BOOK/final-system/ppc64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/ppc64/eglibc-64bit.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/final-system/ppc64/eglibc-64bit.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -122,4 +122,12 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>
 
Index: BOOK/final-system/ppc64/eglibc.xml
===================================================================
--- BOOK/final-system/ppc64/eglibc.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/final-system/ppc64/eglibc.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -42,12 +42,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/eglibc.xml"
-    xpointer="xpointer(//*[@os='l5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/eglibc.xml"
-    xpointer="xpointer(//*[@os='l6'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/sparc64-64/eglibc.xml
===================================================================
--- BOOK/final-system/sparc64-64/eglibc.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/final-system/sparc64-64/eglibc.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -135,4 +135,12 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
     <para os="u">The stubs.h header installed by EGLIBC looks for stubs-32.h
     and stubs-64.h. This configuration of EGLIBC only generates stubs-64.h. Fix
Index: BOOK/final-system/sparc64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/sparc64/eglibc-64bit.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/final-system/sparc64/eglibc-64bit.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -121,4 +121,12 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>
 
Index: BOOK/final-system/x86/eglibc.xml
===================================================================
--- BOOK/final-system/x86/eglibc.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/final-system/x86/eglibc.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -139,4 +139,12 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>
 
Index: BOOK/final-system/x86_64-64/eglibc.xml
===================================================================
--- BOOK/final-system/x86_64-64/eglibc.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/final-system/x86_64-64/eglibc.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -155,4 +155,12 @@
 
     <screen><userinput>rm -v /usr/bin/ldd.bak</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
 
   </sect2>
Index: BOOK/final-system/x86_64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/x86_64/eglibc-64bit.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/final-system/x86_64/eglibc-64bit.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -116,4 +116,12 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='ra'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='rb'])"/>
+
   </sect2>
 
Index: BOOK/final-system/x86_64/eglibc.xml
===================================================================
--- BOOK/final-system/x86_64/eglibc.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/final-system/x86_64/eglibc.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -43,12 +43,4 @@
     xpointer="xpointer(//*[@os='l4'])"/>
     
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/eglibc.xml"
-    xpointer="xpointer(//*[@os='l5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/eglibc.xml"
-    xpointer="xpointer(//*[@os='l6'])"/>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
Index: BOOK/general.ent
===================================================================
--- BOOK/general.ent	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/general.ent	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -3,5 +3,5 @@
 <!ENTITY month "09"> <!-- Use two digits -->
 <!ENTITY month_name "August">
-<!ENTITY day "08"> <!-- Use two digits -->
+<!ENTITY day "11"> <!-- Use two digits -->
 <!ENTITY year "2012"> <!-- Use four digits -->
 
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/introduction/common/changelog.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -37,4 +37,13 @@
 -->
    <listitem>
+      <para>September 11, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Install NIS and RPC related headers in cross-tools and final-system eglibc/eglibc-64bit installs.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+   <listitem>
       <para>September 07, 2012</para>
       <itemizedlist>
Index: BOOK/introduction/mips64/changelog.xml
===================================================================
--- BOOK/introduction/mips64/changelog.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/introduction/mips64/changelog.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -33,4 +33,13 @@
 
 -->
+    <listitem>
+      <para>11 September 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Remove rpc header fix for final-system eglibc multilib 32 bit.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>08 September 2012</para>
Index: BOOK/introduction/ppc64/changelog.xml
===================================================================
--- BOOK/introduction/ppc64/changelog.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/introduction/ppc64/changelog.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -33,4 +33,13 @@
 
 -->
+    <listitem>
+      <para>11 September 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Remove rpc header fix for final-system eglibc multilib 32 bit.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>08 September 2012</para>
Index: BOOK/introduction/sparc64/changelog.xml
===================================================================
--- BOOK/introduction/sparc64/changelog.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/introduction/sparc64/changelog.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -33,4 +33,13 @@
 
 -->
+    <listitem>
+      <para>11 September 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Remove rpc header fix for final-system eglibc multilib 32 bit.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>08 September 2012</para>
Index: BOOK/introduction/x86_64/changelog.xml
===================================================================
--- BOOK/introduction/x86_64/changelog.xml	(revision 85e1f266ac3995457ee4383d3f1f61bb844f543d)
+++ BOOK/introduction/x86_64/changelog.xml	(revision f1778eba0ffa989d12daf033f80f582e4eb1bec0)
@@ -33,4 +33,13 @@
 
 -->
+    <listitem>
+      <para>11 September 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[William Harrington] - Remove rpc header fix for final-system eglibc multilib 32 bit.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>08 September 2012</para>
