Index: BOOK/cross-tools/x86/uclibc-headers.xml
===================================================================
--- BOOK/cross-tools/x86/uclibc-headers.xml	(revision a58af158c215634218ad924bb7bda1e5142b66e5)
+++ BOOK/cross-tools/x86/uclibc-headers.xml	(revision e2d2a2d5ddcf79baea00ff517b11cacaae4d2c7e)
@@ -23,8 +23,17 @@
     <title>Installation of uClibc Headers</title>
 
-    <para os="a">By default uClibc symlinks all its headers from the source, we
+    <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>
+
+<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>
+
+    <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="b"><userinput>cp Makefile Makefile.orig
+<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
@@ -33,20 +42,20 @@
 done</userinput></screen>
 
-    <para os="c">Now we will ask uClibc to create a default configuration:</para>
+    <para os="e">Now we will ask uClibc to create a default configuration:</para>
 
-<screen os="d"><userinput>make defconfig</userinput></screen>
+<screen os="f"><userinput>make defconfig</userinput></screen>
 
-   <para os="e">Create the Headers:</para>
+   <para os="g">Create the Headers:</para>
 
-<screen os="f"><userinput>make KERNEL_SOURCE=${CLFS}/usr TARGET_ARCH=i386 headers</userinput></screen>
+<screen os="h"><userinput>make KERNEL_SOURCE=${CLFS}/usr TARGET_ARCH=i386 headers</userinput></screen>
 
-   <para os="g">We will remove the files that were copied over from our Linux Headers, these
+   <para os="i">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="h"><userinput>rm include/{asm,asm-generic,linux}</userinput></screen>
+<screen os="j"><userinput>rm include/{asm,asm-generic,linux}</userinput></screen>
 
-   <para os="i">Install the Headers:</para>
+   <para os="k">Install the Headers:</para>
 
-<screen os="j"><userinput>cp -a include/* ${CLFS}/usr/include</userinput></screen>
+<screen os="l"><userinput>cp -a include/* ${CLFS}/usr/include</userinput></screen>
 
   </sect2>
Index: BOOK/cross-tools/x86/uclibc.xml
===================================================================
--- BOOK/cross-tools/x86/uclibc.xml	(revision a58af158c215634218ad924bb7bda1e5142b66e5)
+++ BOOK/cross-tools/x86/uclibc.xml	(revision e2d2a2d5ddcf79baea00ff517b11cacaae4d2c7e)
@@ -38,12 +38,18 @@
    extra/Configs/Config.in.orig > extra/Configs/Config.in</userinput></screen>
 
-    <para os="c">Create default configuration:</para>
+    <note os="c">
+      <para>Below we are just telling uClibc to use the default configuration of
+      uClibc. For those for more adventureous, you can use make menuconfig, and
+      do a more custom build of your uClibc.</para>
+    </note>
 
-<screen os="d"><userinput>make defconfig</userinput></screen>
+    <para os="d">Create default configuration:</para>
 
-   <para os="e">We will need to edit the configuration file, to make sure everything gets
+<screen os="e"><userinput>make defconfig</userinput></screen>
+
+   <para os="f">We will need to edit the configuration file, to make sure everything gets
    compiled and put into it's proper locations:</para>
 
-<screen os="f"><userinput>cp .config .config.orig
+<screen os="g"><userinput>cp .config .config.orig
 sed -e "/^CROSS_COMPILER_PREFIX/s:=.*:=\"${CLFS_TARGET}-\":" \
     -e "/^KERNEL_SOURCE/s:=.*:=\"${CLFS}/usr\":" \
@@ -53,16 +59,16 @@
     .config.orig > .config</userinput></screen>
 
-    <para os="g">Compile the package:</para>
+    <para os="h">Compile the package:</para>
 
-<screen os="h"><userinput>make TARGET_ARCH=i386</userinput></screen>
+<screen os="i"><userinput>make TARGET_ARCH=i386</userinput></screen>
 
-   <para os="i">We will remove the files that were copied over from our Linux Headers, these
+   <para os="j">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="j"><userinput>rm include/{asm,asm-generic,linux}</userinput></screen>
+<screen os="k"><userinput>rm include/{asm,asm-generic,linux}</userinput></screen>
 
-    <para os="k">Install the package:</para>
+    <para os="l">Install the package:</para>
 
-<screen os="l"><userinput>make PREFIX=${CLFS} install</userinput></screen>
+<screen os="m"><userinput>make PREFIX=${CLFS} install</userinput></screen>
 
   </sect2>
