Index: BOOK/boot/64/kmod.xml
===================================================================
--- BOOK/boot/64/kmod.xml	(revision 3ef9c58d4c32680d476c0bcefc8cad25f3ab29d0)
+++ BOOK/boot/64/kmod.xml	(revision 3ef9c58d4c32680d476c0bcefc8cad25f3ab29d0)
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-boot-kmod" role="wrap">
+  <?dbhtml filename="kmod.html"?>
+
+  <title>Kmod-&kmod-version;</title>
+
+  <indexterm zone="ch-boot-kmod">
+    <primary sortas="a-Kmod">Kmod</primary>
+    <secondary>boot</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../../final-system/common/kmod.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of Kmod</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/kmod.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+<screen os="b"><userinput>liblzma_CFLAGS="-I/tools/include" liblzma_LIBS="-L/tools/lib -llzma" \
+zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib -lz" \
+CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-xz --with-zlib</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/kmod.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/kmod.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/kmod.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/kmod.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-kmod" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/boot/mips64-64-chapter.xml
===================================================================
--- BOOK/boot/mips64-64-chapter.xml	(revision bc61a24b8b9e66caaa76f9bf2ca01e8a5ddd5c57)
+++ BOOK/boot/mips64-64-chapter.xml	(revision 3ef9c58d4c32680d476c0bcefc8cad25f3ab29d0)
@@ -15,5 +15,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/kmod.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
Index: BOOK/boot/ppc64-64-chapter.xml
===================================================================
--- BOOK/boot/ppc64-64-chapter.xml	(revision bc61a24b8b9e66caaa76f9bf2ca01e8a5ddd5c57)
+++ BOOK/boot/ppc64-64-chapter.xml	(revision 3ef9c58d4c32680d476c0bcefc8cad25f3ab29d0)
@@ -15,5 +15,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
Index: BOOK/boot/sparc64-64-chapter.xml
===================================================================
--- BOOK/boot/sparc64-64-chapter.xml	(revision bc61a24b8b9e66caaa76f9bf2ca01e8a5ddd5c57)
+++ BOOK/boot/sparc64-64-chapter.xml	(revision 3ef9c58d4c32680d476c0bcefc8cad25f3ab29d0)
@@ -15,5 +15,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
Index: BOOK/boot/x86_64-64-chapter.xml
===================================================================
--- BOOK/boot/x86_64-64-chapter.xml	(revision bc61a24b8b9e66caaa76f9bf2ca01e8a5ddd5c57)
+++ BOOK/boot/x86_64-64-chapter.xml	(revision 3ef9c58d4c32680d476c0bcefc8cad25f3ab29d0)
@@ -15,5 +15,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/boot-scripts.xml"/>
  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/kmod.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/kmod.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/sysvinit.xml"/>
Index: OK/boot/x86_64-64/kmod.xml
===================================================================
--- BOOK/boot/x86_64-64/kmod.xml	(revision bc61a24b8b9e66caaa76f9bf2ca01e8a5ddd5c57)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-kmod" role="wrap">
-  <?dbhtml filename="kmod.html"?>
-
-  <title>Kmod-&kmod-version;</title>
-
-  <indexterm zone="ch-boot-kmod">
-    <primary sortas="a-Kmod">Kmod</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-  href="../../final-system/common/kmod.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Kmod</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/kmod.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>liblzma_CFLAGS="-I/tools/include" liblzma_LIBS="-L/tools/lib -llzma" \
-zlib_CFLAGS="-I/tools/include" zlib_LIBS="-L/tools/lib -lz" \
-CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --with-xz --with-zlib</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/kmod.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/kmod.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/kmod.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/kmod.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-kmod" role="."/></para>
-
-  </sect2>
-
-</sect1>
