Index: final-system/x86_64-64-chapter.xml
===================================================================
--- final-system/x86_64-64-chapter.xml	(revision 4df65556295bd248bd64949f7b5c3ed4f6867de5)
+++ final-system/x86_64-64-chapter.xml	(revision 3f01f6031f105acd959cc2c2d8676cbd633b5f52)
@@ -66,5 +66,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hotplug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/grub.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/bin86.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/lilo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/stripping.xml"/>
Index: final-system/x86_64-64/bin86.xml
===================================================================
--- final-system/x86_64-64/bin86.xml	(revision 3f01f6031f105acd959cc2c2d8676cbd633b5f52)
+++ final-system/x86_64-64/bin86.xml	(revision 3f01f6031f105acd959cc2c2d8676cbd633b5f52)
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+<sect1 id="ch-system-bin86" role="wrap">
+  <?dbhtml filename="bin86.html"?>
+
+  <title>Bin86-&bin86-version;</title>
+
+  <indexterm zone="ch-system-bin86">
+    <primary sortas="a-Bin86">Bin86</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The Bin86 package contains an assembler and linker to produce
+      16 or 32-bit 8086 machine code.</para>
+
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
+
+      <seglistitem>
+        <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make
+	</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+
+  <sect2 role="installation">
+    <title>Installation of Bin86</title>
+
+    <para os="a">We are building bin86 because it is required to
+      compile lilo, and at the moment no other bootloader builds and runs
+      on a pure64 system. If your machine has multiple systems (i.e. x86
+      or multilib) you may prefer to use the bootloader from those
+      systems, such as grub.</para>
+
+    <para os="p1">This patch updates bin86 to compile on x86_64:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&bin86-x86_64-patch;</userinput></screen>
+
+    <para os="c">Compile the package:</para>
+
+<screen os="d"><userinput>make</userinput></screen>
+
+    <para os="e">Install the package:</para>
+
+<screen os="f"><userinput>make PREFIX=/usr install</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-bin86" role="content">
+    <title>Contents of Bin86</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+
+      <seglistitem>
+        <seg>as86, ld86, nm86, objdump86, size86</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="as86">
+        <term><command>as86</command></term>
+        <listitem>
+          <para>An 8086 assembler</para>
+          <indexterm zone="ch-system-bin86 as86">
+            <primary sortas="b-as86">as86</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ld86">
+        <term><command>ld86</command></term>
+        <listitem>
+          <para>A linker for the object files produced by as86</para>
+          <indexterm zone="ch-system-bin86 ld86">
+            <primary sortas="b-ld86">ld86</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="nm86">
+        <term><command>nm86</command></term>
+        <listitem>
+          <para>Symbolic link to objdump86</para>
+          <indexterm zone="ch-system-bin86 nm86">
+            <primary sortas="b-nm86">nm86</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="objdump86">
+        <term><command>objdump86</command></term>
+        <listitem>
+          <para>A utility to examine and report on the output from as86 and ld86</para>
+          <indexterm zone="ch-system-bin86 objdump86">
+            <primary sortas="b-objdump86">objdump86</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="size86">
+        <term><command>size86</command></term>
+        <listitem>
+          <para>Symbolic link to objdump86</para>
+          <indexterm zone="ch-system-bin86 size86">
+            <primary sortas="b-size86">size86</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: final-system/x86_64-64/grub.xml
===================================================================
--- final-system/x86_64-64/grub.xml	(revision 4df65556295bd248bd64949f7b5c3ed4f6867de5)
+++ 	(revision )
@@ -1,75 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-<sect1 id="ch-system-grub" role="wrap">
-  <?dbhtml filename="grub.html"?>
-
-  <title>GRUB-&grub-version;</title>
-
-  <indexterm zone="ch-system-grub">
-    <primary sortas="a-GRUB">GRUB</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GRUB</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <para os="p1">This patch updates grub to work in a Pure64 environment:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&grub-pure64-patch;</userinput></screen>
-
-    <para os="p3">Make the source package aware of the patch:</para>
-
-<screen os="p4"><userinput>autoreconf</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen><userinput>./configure --prefix=/usr --host=$(LFS_TARGET)</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/grub.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/grub.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/grub.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(id('contents-grub'))"/>
-
-</sect1>
Index: final-system/x86_64-64/lilo.xml
===================================================================
--- final-system/x86_64-64/lilo.xml	(revision 3f01f6031f105acd959cc2c2d8676cbd633b5f52)
+++ final-system/x86_64-64/lilo.xml	(revision 3f01f6031f105acd959cc2c2d8676cbd633b5f52)
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+<sect1 id="ch-system-lilo" role="wrap">
+  <?dbhtml filename="lilo.html"?>
+
+  <title>Lilo-&lilo-version;</title>
+
+  <indexterm zone="ch-system-lilo">
+    <primary sortas="a-Lilo">Lilo</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para os="a">The Lilo package contains the Linux Loader, a bootloader.</para>
+
+    <para os="b">We have chosen to use lilo because at the moment no other
+      bootloader builds and runs on a pure64 system. If your machine has
+      multiple systems (i.e. x86 or multilib) you may prefer to use the
+      bootloader from the other system, such as grub.</para>
+
+    <segmentedlist>
+      <segtitle>&dependencies;</segtitle>
+
+      <seglistitem>
+        <seg>Bash, Bin86, Binutils, Coreutils, GCC, Glibc, Make, Sed
+	</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+
+  <sect2 role="installation">
+    <title>Installation of Lilo</title>
+
+    <para os="c">Compile the package:</para>
+
+<screen os="d"><userinput>make</userinput></screen>
+
+    <para os="e">Install the package:</para>
+
+<screen os="f"><userinput>make install</userinput></screen>
+
+    <para>At the end of the installation the make install process will
+      print a message stating that /sbin/lilo has to be executed to
+      complete the update. Don&quot;t do this as it has no use. The
+      /etc/lilo.conf isn&quot;t present yet. We will complete the
+      installation of lilo in chapter 12.</para>
+
+  </sect2>
+
+  <sect2 id="contents-lilo" role="content">
+    <title>Contents of Lilo</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+
+      <seglistitem>
+        <seg>diag1.img, lilo, mkrescue, keytab-lilo.pl</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="diag1.img">
+        <term><command>diag1.img</command></term>
+        <listitem>
+          <para>A diagnostic disk boot image.</para>
+          <indexterm zone="ch-system-lilo diag1.img">
+            <primary sortas="b-diag1.img">diag1.img</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lilo">
+        <term><command>lilo</command></term>
+        <listitem>
+          <para>Lilo installs the Linux boot loader which is used to start
+            a Linux system.</para>
+          <indexterm zone="ch-system-lilo lilo">
+            <primary sortas="b-lilo">lilo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mkrescue">
+        <term><command>mkrescue</command></term>
+        <listitem>
+          <para>A script to make a bootable floppy or CD image using the
+	    default settings from the configuration file.</para>
+          <indexterm zone="ch-system-lilo mkrescue">
+            <primary sortas="b-mkrescue">mkrescue</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="keytab-lilo.pl">
+        <term><command>keytab-lilo.pl</command></term>
+        <listitem>
+          <para>A perl script to create a keyboard translation table to
+	    allow the bootloader to process keystrokes to match your
+	    keyboard layout.</para>
+          <indexterm zone="ch-system-lilo keytab-lilo.pl">
+            <primary sortas="b-keytab-lilo.pl">keytab-lilo.pl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
