Index: BOOK/final-system/common/findutils.xml
===================================================================
--- BOOK/final-system/common/findutils.xml	(revision 425f616527db0aea5a643e9f246bc447e308ba29)
+++ BOOK/final-system/common/findutils.xml	(revision e990cbd941e4e43faab1ff13caf9b3d78f68431c)
@@ -57,4 +57,11 @@
 
 <screen os="h"><userinput>make install</userinput></screen>
+
+    <para os="t">Find from Findutils is used by some of the scripts
+    in the CLFS-Bootscripts package. As <filename
+    class="directory">/usr</filename> may not be available during the early
+    stages of booting, those binaries need to be on the root partition:</para>
+
+<screen os="j"><userinput>mv -v /usr/bin/find /bin/find</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/common/kbd.xml
===================================================================
--- BOOK/final-system/common/kbd.xml	(revision 425f616527db0aea5a643e9f246bc447e308ba29)
+++ BOOK/final-system/common/kbd.xml	(revision e990cbd941e4e43faab1ff13caf9b3d78f68431c)
@@ -32,5 +32,5 @@
     <para os="a">Prepare Kbd for compilation:</para>
 
-<screen os="b"><userinput>./configure</userinput></screen>
+<screen os="b"><userinput>./configure --datadir=/lib/kbd</userinput></screen>
 
     <para os="c">Compile the package:</para>
@@ -43,4 +43,11 @@
 
 <screen os="g"><userinput>make install</userinput></screen>
+
+    <para os="h">Some of the Programs from Kbd are used by some of the scripts
+    in the CLFS-Bootscripts package. As <filename
+    class="directory">/usr</filename> may not be available during the early
+    stages of booting, those binaries need to be on the root partition:</para>
+
+<screen os="i"><userinput>mv -v /usr/bin/{kbd_mode,openvt,setfont} /bin</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/multilib/findutils.xml
===================================================================
--- BOOK/final-system/multilib/findutils.xml	(revision 425f616527db0aea5a643e9f246bc447e308ba29)
+++ BOOK/final-system/multilib/findutils.xml	(revision e990cbd941e4e43faab1ff13caf9b3d78f68431c)
@@ -62,4 +62,12 @@
     href="../common/findutils.xml"
     xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/findutils.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/findutils.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
 
   </sect2>
Index: BOOK/final-system/multilib/kbd.xml
===================================================================
--- BOOK/final-system/multilib/kbd.xml	(revision 425f616527db0aea5a643e9f246bc447e308ba29)
+++ BOOK/final-system/multilib/kbd.xml	(revision e990cbd941e4e43faab1ff13caf9b3d78f68431c)
@@ -34,5 +34,5 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --datadir=/lib64/kbd</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -54,4 +54,12 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
   </sect2>
 
Index: BOOK/final-system/sparc/kbd.xml
===================================================================
--- BOOK/final-system/sparc/kbd.xml	(revision 425f616527db0aea5a643e9f246bc447e308ba29)
+++ BOOK/final-system/sparc/kbd.xml	(revision e990cbd941e4e43faab1ff13caf9b3d78f68431c)
@@ -63,4 +63,12 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
   </sect2>
 
Index: BOOK/final-system/sparc64/kbd.xml
===================================================================
--- BOOK/final-system/sparc64/kbd.xml	(revision 425f616527db0aea5a643e9f246bc447e308ba29)
+++ BOOK/final-system/sparc64/kbd.xml	(revision e990cbd941e4e43faab1ff13caf9b3d78f68431c)
@@ -66,4 +66,12 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
   </sect2>
 
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 425f616527db0aea5a643e9f246bc447e308ba29)
+++ BOOK/introduction/common/changelog.xml	(revision e990cbd941e4e43faab1ff13caf9b3d78f68431c)
@@ -38,4 +38,15 @@
 
     <listitem>
+      <para>July 5, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Fixes a possible issue with bootscripts if the
+	  the /usr partition is not mounted during startup. Moved find to /bin and
+	  moved some kbd utilities to /bin.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>July 4, 2006</para>
       <itemizedlist>
