Index: BOOK/final-system/common/kbd.xml
===================================================================
--- BOOK/final-system/common/kbd.xml	(revision 1ab60d4faecb0d132566cf32247f99195d7e32b0)
+++ BOOK/final-system/common/kbd.xml	(revision 1a5985d7c3783df263217541a77e1dcb2da187c2)
@@ -28,29 +28,15 @@
     <para os="a">Prepare Kbd for compilation:</para>
 
-<screen os="b"><userinput>./configure --prefix=/usr --datadir=/lib/kbd</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--datadir</parameter></term>
-        <listitem>
-          <para>This option places the Kbd data and keymap files into /lib/kbd,
-          as they are used by some of the scripts in the CLFS-Bootscripts
-          package and must be on the root partition.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="f">This package does not come with a test suite.</para>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
+<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
+
+    <para os="c">Compile the package:</para>
+
+<screen os="d"><userinput>make</userinput></screen>
+
+    <para os="e">This package does not come with a test suite.</para>
+
+    <para os="f">Install the package:</para>
+
+<screen os="g"><userinput>make install</userinput></screen>
 
     <para os="i">Some of the programs from Kbd are used by scripts
@@ -59,5 +45,5 @@
     stages of booting, those binaries need to be on the root partition:</para>
 
-<screen os="j"><userinput>mv -v /usr/bin/{kbd_mode,loadkeys,openvt,setfont} /bin</userinput></screen>
+<screen os="h"><userinput>mv -v /usr/bin/{kbd_mode,loadkeys,openvt,setfont} /bin</userinput></screen>
 
   </sect2>
Index: BOOK/final-system/multilib/kbd.xml
===================================================================
--- BOOK/final-system/multilib/kbd.xml	(revision 1ab60d4faecb0d132566cf32247f99195d7e32b0)
+++ BOOK/final-system/multilib/kbd.xml	(revision 1a5985d7c3783df263217541a77e1dcb2da187c2)
@@ -26,20 +26,11 @@
     xpointer="xpointer(//*[@os='a'])"/>
 
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-    --datadir=/lib64/kbd</userinput></screen>
+<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
 
-    <variablelist os="c">
-      <title>The meaning of the configure options:</title>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
 
-      <varlistentry>
-        <term><parameter>--datadir</parameter></term>
-        <listitem>
-          <para>This option places the Kbd data and keymap files into
-          /lib64/kbd, as they are used by some of the scripts in the
-          CLFS-Bootscripts package and must be on the root partition.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
+<screen os="e"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -47,5 +38,7 @@
     xpointer="xpointer(//*[@os='d'])"/>
 
-<screen os="e"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/kbd.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -61,12 +54,4 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
   </sect2>
 
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 1ab60d4faecb0d132566cf32247f99195d7e32b0)
+++ BOOK/introduction/common/changelog.xml	(revision 1a5985d7c3783df263217541a77e1dcb2da187c2)
@@ -42,4 +42,7 @@
         <listitem>
           <para>[Jim] - Corrected Build Issue with Groff 1.20.</para>
+        </listitem>
+        <listitem>
+          <para>[Jim] - Modified build of KBD to make utf-8 friendly.</para>
         </listitem>
       </itemizedlist>
