Index: BOOK/cross-tools/x86/uclibc-headers.xml
===================================================================
--- BOOK/cross-tools/x86/uclibc-headers.xml	(revision e2d2a2d5ddcf79baea00ff517b11cacaae4d2c7e)
+++ BOOK/cross-tools/x86/uclibc-headers.xml	(revision e666df1756bb2c00353b18825f2bba8b01b9bc81)
@@ -23,26 +23,35 @@
     <title>Installation of uClibc Headers</title>
 
-    <para os="a">Since we are cross-compiling, we need to make sure when we
-    configuration for our architecture we get the correct information. The
-    following sed makes sure we are using the proper settings for our
-    architecture: (This is a place holder for the other architectures</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="uclibc.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>cp extra/Configs/Config.in extra/Configs/Config.in.orig
-sed -e "s:default TARGET_i386:default TARGET_i386:" \
-   extra/Configs/Config.in.orig > extra/Configs/Config.in</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="uclibc.xml"
+  xpointer="xpointer(//*[@os='b'])"/>
 
-    <para os="c">By default uClibc symlinks all its headers from the source, we
-    will change this behavious with the following sed:</para>
- 	
-<screen os="d"><userinput>cp Makefile Makefile.orig
-sed -e 's/$(LN) -fs/cp/g' Makefile.orig > Makefile
-for file in `find libc/sysdeps/linux -name Makefile`; do
-        cp $file $file.orig
-        sed -e 's/$(LN) -fs/cp/g' -e 's@../libc/@$(TOPDIR)libc/@g' $file.orig > $file
-done</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="uclibc.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
 
-    <para os="e">Now we will ask uClibc to create a default configuration:</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="uclibc.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="f"><userinput>make defconfig</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="uclibc.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="uclibc.xml"
+  xpointer="xpointer(//*[@os='f'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="uclibc.xml"
+  xpointer="xpointer(//*[@os='h'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="uclibc.xml"
+  xpointer="xpointer(//*[@os='i'])"/>
 
    <para os="g">Create the Headers:</para>
@@ -53,7 +62,11 @@
    files were copied into the source directory of uClibc:</para>
 
-<screen os="j"><userinput>rm include/{asm,asm-generic,linux}</userinput></screen>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="uclibc.xml"
+  xpointer="xpointer(//*[@os='l'])"/>
 
-   <para os="k">Install the Headers:</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="uclibc.xml"
+  xpointer="xpointer(//*[@os='m'])"/>
 
 <screen os="l"><userinput>cp -a include/* ${CLFS}/usr/include</userinput></screen>
Index: BOOK/cross-tools/x86/uclibc.xml
===================================================================
--- BOOK/cross-tools/x86/uclibc.xml	(revision e2d2a2d5ddcf79baea00ff517b11cacaae4d2c7e)
+++ BOOK/cross-tools/x86/uclibc.xml	(revision e666df1756bb2c00353b18825f2bba8b01b9bc81)
@@ -59,16 +59,27 @@
     .config.orig > .config</userinput></screen>
 
-    <para os="h">Compile the package:</para>
+    <para os="h">We will need to make sure that some settings in uClibc are set so we
+    can utilize all the features of BusyBox:</para>
 
-<screen os="i"><userinput>make TARGET_ARCH=i386</userinput></screen>
+<screen os="i"><userinput>UCLIBC_OPTIONS="DO_C99_MATH UCLIBC_HAS_RPC UCLIBC_HAS_CTYPE_CHECKED UCLIBC_HAS_WCHAR UCLIBC_HAS_HEXADECIMAL_FLOATS
+                UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE UCLIBC_HAS_PRINTF_M_SPEC UCLIBC_HAS_FTW UCLIBC_HAS_IPV6"
+for config in $UCLIBC_OPTIONS; do
+        cp .config .config.orig
+        sed -e "s:# ${config} is not set:${config}=y:" .config.orig > .config
+done
+echo "UCLIBC_HAS_FULL_RPC=y" >> .config</userinput></screen>
 
-   <para os="j">We will remove the files that were copied over from our Linux Headers, these
+    <para os="j">Compile the package:</para>
+
+<screen os="k"><userinput>make TARGET_ARCH=i386</userinput></screen>
+
+   <para os="l">We will remove the files that were copied over from our Linux Headers, these
    files were copied into the source directory of uClibc:</para>
 
-<screen os="k"><userinput>rm include/{asm,asm-generic,linux}</userinput></screen>
+<screen os="m"><userinput>rm include/{asm,asm-generic,linux}</userinput></screen>
 
-    <para os="l">Install the package:</para>
+    <para os="n">Install the package:</para>
 
-<screen os="m"><userinput>make PREFIX=${CLFS} install</userinput></screen>
+<screen os="o"><userinput>make PREFIX=${CLFS} install</userinput></screen>
 
   </sect2>
