Index: BOOK/boot/x86_64-64-chapter.xml
===================================================================
--- BOOK/boot/x86_64-64-chapter.xml	(revision 41969c7b7468101e2d5e82c2a4777c901c825f22)
+++ BOOK/boot/x86_64-64-chapter.xml	(revision 34be04a6cab56e5abf0198256fbbb5f8c056c7f6)
@@ -23,6 +23,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/kernel.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/bootloaders.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-build.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-build.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/flags.xml"/>
@@ -31,5 +31,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.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="x86_64-64/lilo.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
 
Index: OK/boot/x86_64-64/bin86.xml
===================================================================
--- BOOK/boot/x86_64-64/bin86.xml	(revision 41969c7b7468101e2d5e82c2a4777c901c825f22)
+++ 	(revision )
@@ -1,64 +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-bin86" role="wrap">
-  <?dbhtml filename="bin86.html"?>
-
-  <title>Bin86-&bin86-version;</title>
-
-  <indexterm zone="ch-boot-bin86">
-    <primary sortas="a-Bin86">Bin86</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/x86_64-64/bin86.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bin86</title>
-
-    <para os="a">We are building Bin86 so that we can compile Lilo.
-    Both <command>as86</command> and <command>ld86</command> need to
-    run on the host system to assemble x86_64 code. We cannot
-    compile the whole package like this, but fortunately these two
-    programs are the only parts we require.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86_64-64/bin86.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86_64-64/bin86.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <para os="b">The Bin86 package does not contain a <command>configure
-    </command> script. Natively compile only the necessary parts with:
-    </para>
-
-<screen os="c"><userinput>make CC=gcc -C as as86
-make CC=gcc -C ld ld86</userinput></screen>
-
-    <para os="e">Install the assembler and linker into
-    <filename class="directory">/cross-tools</filename> so they will be in
-    the PATH when we build Lilo, using prefixes to show that their
-    output is not for a native system:</para>
-
-<screen os="f"><userinput>install -v -m 755 -s as/as86 /cross-tools/bin/${CLFS_TARGET}-as86
-install -v -m 755 -s ld/ld86 /cross-tools/bin/${CLFS_TARGET}-ld86</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bin86" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/x86_64-64/lilo-build.xml
===================================================================
--- BOOK/boot/x86_64-64/lilo-build.xml	(revision 41969c7b7468101e2d5e82c2a4777c901c825f22)
+++ 	(revision )
@@ -1,53 +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-lilo-build" role="wrap">
-  <?dbhtml filename="lilo-build.html"?>
-
-  <title>Lilo-&lilo-version;</title>
-
-  <indexterm zone="ch-boot-lilo-build">
-    <primary sortas="a-Lilo">Lilo</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/x86_64-64/lilo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Lilo</title>
-
-    <para os="a">The following patch forces Lilo to use our cross-compiler
-    (except for a couple of utilities which run during the compile),
-    and to look for <command>as86</command> and <command>ld86</command>
-    under the names by which we installed them.</para>
-
-<screen os="b"><userinput>patch -Np1 -i ../&lilo-cross-x86_64-patch;</userinput></screen>
-
-    <para os="c">Compile the program which installs the loader, linking
-    it statically so that it does not have to link to host libraries
-    when it runs:</para> 
-
-<screen os="d"><userinput>make lilo.static</userinput></screen>
-
-    <para os="e">Install only the parts we need:</para>
-
-<screen os="f"><userinput>install -v -m755 lilo.static /tools/bin
-install -v -m755 keytab-lilo.pl /tools/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-lilo" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/x86_64-64/lilo.xml
===================================================================
--- BOOK/boot/x86_64-64/lilo.xml	(revision 41969c7b7468101e2d5e82c2a4777c901c825f22)
+++ 	(revision )
@@ -1,115 +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-lilo">
-  <?dbhtml filename="lilo.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <indexterm zone="ch-boot-lilo">
-    <primary sortas="a-Lilo">Lilo</primary>
-    <secondary>configuring</secondary>
-  </indexterm>
-
-<!--
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../../final-system/x86/grub.xml"
-     xpointer="xpointer(//*[@os='n1'])"/>
--->
-
-  <para os="a">You are nearly ready to boot to the new temporary system.
-  One of the last things to do is to ensure that the system can be booted.
-  The instructions below apply only to x86_64 machines on which Lilo is going
-  to be installed. Information on using a pre-installed GRUB on machines
-  currently running as x86 or x86_64 multilib should be available in the
-  usual resource-specific locations for those architectures.  If you have
-  installed an x86 version of Lilo, these instructions should be modified
-  to refer to the <command>lilo</command> and <command>keytab-lilo.pl
-  </command> commands you installed on the host system.</para>
-
-<!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
--->
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86_64-64/lilo.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <para os="d">Earlier, we compiled and installed the Lilo boot loader software
-  in preparation for this step. The procedure involves writing a boot image to
-  a specific location on the hard drive. If you have a floppy disk drive, or
-  if you have installed a CD recording program, we highly recommend using
-  <command>mkrescue</command> to create a Lilo boot floppy, or CD (using e.g.
-  <command>dvdrecord</command> from dvdrtools) as a test and as a backup.</para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86_64-64/lilo.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f" role="nodump"><userinput>keytab-lilo.pl uk >${CLFS}/boot/uk.ktl</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86_64-64/lilo.xml"
-  xpointer="xpointer(//*[@os='g'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86_64-64/lilo.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j" role="nodump"><userinput>cat &gt; ${CLFS}/etc/lilo.conf &lt;&lt; "EOF"
-<literal># Begin /etc/lilo.conf
-# lilo.conf
-#
-# global options
-boot=/dev/&lt;bootdisk&gt;
-keytable=/boot/&lt;keytable&gt;
-lba32
-map=/boot/map
-prompt
-
-# set the name of the default image to boot
-default=clfs
-
-# define an image
-image=/boot/clfskernel&linux-version;
-    label=clfs
-    root=/dev/&lt;partition&gt;
-    read-only
-# optionally add parameters to pass, e.g.
-#   append="video=radeonfb:1024x768-16@70"
-
-# if you had an existing system, you could
-# add its details here.
-EOF</literal></userinput></screen>
-
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86_64-64/lilo.xml"
-  xpointer="xpointer(//*[@os='k'])"/>
-
-  <warning os="l">
-    <para>The following command will overwrite any current boot loader.
-    Do not run the command if this is not desired. If you have
-    cross-compiled on a different machine from the target, you must
-    install the bootloader on the target machine, the installed boot
-    block is not a file which can be copied with <command>tar</command>. 
-    </para>
-  </warning>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86_64-64/lilo.xml"
-  xpointer="xpointer(//*[@os='m'])"/>
-
-<screen os="n" role="nodump"><userinput>/tools/bin/lilo.static -v -C ${CLFS}/etc/lilo.conf</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86_64-64/lilo.xml"
-  xpointer="xpointer(//*[@os='o'])"/>
-
-</sect1>
Index: BOOK/bootable/x86/kernel.xml
===================================================================
--- BOOK/bootable/x86/kernel.xml	(revision 41969c7b7468101e2d5e82c2a4777c901c825f22)
+++ BOOK/bootable/x86/kernel.xml	(revision 34be04a6cab56e5abf0198256fbbb5f8c056c7f6)
@@ -95,5 +95,5 @@
     <para os="v">Issue the following command to install the kernel:</para>
 
-<screen><userinput>cp -v arch/i386/boot/bzImage /boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v arch/i386/boot/bzImage /boot/vmlinuz-clfs-&linux-version;</userinput></screen>
 
     <para os="w"><filename>System.map</filename> is a symbol file for the kernel.
Index: BOOK/bootable/x86_64-64-chapter.xml
===================================================================
--- BOOK/bootable/x86_64-64-chapter.xml	(revision 41969c7b7468101e2d5e82c2a4777c901c825f22)
+++ BOOK/bootable/x86_64-64-chapter.xml	(revision 34be04a6cab56e5abf0198256fbbb5f8c056c7f6)
@@ -15,5 +15,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/kernel.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="x86/grub.xml"/>
 
 </chapter>
Index: OK/bootable/x86_64-64/lilo.xml
===================================================================
--- BOOK/bootable/x86_64-64/lilo.xml	(revision 41969c7b7468101e2d5e82c2a4777c901c825f22)
+++ 	(revision )
@@ -1,136 +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-bootable-lilo">
-  <?dbhtml filename="lilo.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <indexterm zone="ch-bootable-lilo">
-    <primary sortas="a-Lilo">Lilo</primary>
-    <secondary>configuring</secondary>
-  </indexterm>
-
-    <para os="a">Your shiny new CLFS system is almost complete. One of the
-    last things to do is to ensure that the system can be properly booted. The
-    instructions below apply only to computers using Lilo, which in the
-    context of this book means x86_64 Pure64 systems. Information on
-    <quote>boot loading</quote> for other architectures should be available in
-    the usual resource-specific locations for those architectures.</para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-    <para os="c">If you have multiple systems on your machine using a different
-    bootloader such as GRUB, you may prefer to use that instead - consult the
-    appropriate documentation. The rest of this section assumes you are going
-    to use Lilo.</para> 
-
-    <para os="d">Earlier, we compiled and installed the Lilo boot loader
-    software in preparation for this step. The procedure involves writing a
-    boot image to a specific location on the hard drive. We highly recommend
-    using <command>mkrescue</command> to create a Lilo boot CD (using e.g.
-    <command>dvdrecord</command> from dvdrtools) as a backup (this requires
-    loopback block device support in the kernel).</para>
-
-    <para os="e">Normally, you interact with Lilo by using the cursor and
-    <literal>enter</literal> keys to select from the available option(s), but
-    sometimes it is necessary to add other boot options, such as e.g.
-    'init=/bin/bash' to debug boot failures. The more your keyboard layout
-    differs from the US qwerty layout, the harder it becomes to type boot
-    options unless Lilo knows about your keyboard layout. So, we will create a
-    key table for Lilo (.ktl) file - at one point in the documentation these
-    are referred to as .klt files, which may be a typo, but has been followed
-    by some distros. The name, and location, are not important but it is
-    conventional to put these in <filename class="directory">/boot</filename>
-    with the name representing the key layout. For a British keyboard layout,
-    the following command will achieve this:</para> 
-
-<screen os="f" role="nodump"><userinput>keytab-lilo.pl uk >/boot/uk.ktl</userinput></screen>
-
-    <para os="g">The argument to the command is the name of the keymap, or if
-    necessary you can specify the full path to the keymap. Use whatever is
-    appropriate for your keyboard.</para>
-
-    <para os="h">When the x86 CLFS book used to include Lilo, it advised
-    against running it from chroot in case the MBR became corrupted.
-    Provided you have <filename class="directory">/proc</filename> mounted
-    and have device special files for the disks, it seems to be safe to run
-    recent versions of Lilo in chroot, although it is always possible that
-    an updated bootloader, or defective configuration file, may render the
-    system unbootable.</para>  
-
-    <para os="i">The next step is to create
-    <filename>/etc/lilo.conf</filename>:</para>
-
-<screen os="j" role="nodump"><userinput>cat &gt; /etc/lilo.conf &lt;&lt; "EOF"
-<literal># Begin /etc/lilo.conf
-# lilo.conf
-#
-# global options
-boot=/dev/&lt;bootdisk&gt;
-keytable=/boot/&lt;keytable&gt;
-lba32
-map=/boot/map
-prompt
-
-# set the name of the default image to boot
-default=clfs
-
-# define an image
-image=/boot/clfskernel-&linux-version;
-    label=clfs
-    root=/dev/&lt;partition&gt;
-    read-only
-# optionally add parameters to pass, e.g.
-#   append="video=radeonfb:1024x768-16@70"
-
-# repeat for any other kernel images
-
-# optionally, add legacy operating systems
-# see man lilo.conf for examples 
-EOF</literal></userinput></screen>
-
-
-    <para os="k">Replace &lt;bootdisk&gt; with the name of the disk (or
-    partition) on which the boot sector is to be written, e.g. sda.
-    Replace &lt;keytable&gt; with the name of the keytable file you
-    created, and &lt;partition&gt; with the name of the root partition
-    for the new system.
-    </para>
-
-  <warning os="l">
-    <para>The following command will overwrite the current boot loader.
-    Do not run the command if this is not desired.</para>
-  </warning>
-
-    <para os="m">Run Lilo:</para>
-
-<screen os="n" role="nodump"><userinput>/sbin/lilo -v</userinput></screen>
-
-  <note os='o'>
-    <para>People who have been used to GRUB need to be aware that Lilo works
-    differently - in particular, you cannot edit the available choices as you
-    can in the <command>grub</command> shell, and Lilo records the block
-    addresses of the kernels into the boot blocks each time
-    <command>/sbin/lilo</command> is run. This means that when you compile a
-    new kernel, you have to add it to <filename>/etc/lilo.conf</filename> and
-    rerun <command>/sbin/lilo</command>. It also means that if you recompile
-    an existing kernel and save it to the same name you still have to rerun
-    <command>/sbin/lilo</command> in case it now occupies different blocks on
-    the filesystem.</para>
-  </note>
-
-    <para os="p">If you are running multiple systems on this box and using
-    Lilo, it is a good idea to ensure that each system is running the same
-    version of Lilo, otherwise an old version may not be able to overwrite
-    the bootloader from a newer version. You will also need to ensure that the
-    copies of <filename>/etc/lilo.conf</filename> on each system are kept
-    synchronised.</para>
-
-</sect1>
Index: BOOK/bootable/x86_64/kernel.xml
===================================================================
--- BOOK/bootable/x86_64/kernel.xml	(revision 41969c7b7468101e2d5e82c2a4777c901c825f22)
+++ BOOK/bootable/x86_64/kernel.xml	(revision 34be04a6cab56e5abf0198256fbbb5f8c056c7f6)
@@ -94,5 +94,5 @@
     xpointer="xpointer(//*[@os='v'])"/>
 
-<screen><userinput>cp arch/x86_64/boot/bzImage /boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp arch/x86_64/boot/bzImage /boot/vmlinuz-clfs-&linux-version;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-64-chapter.xml	(revision 41969c7b7468101e2d5e82c2a4777c901c825f22)
+++ BOOK/final-system/x86_64-64-chapter.xml	(revision 34be04a6cab56e5abf0198256fbbb5f8c056c7f6)
@@ -70,6 +70,5 @@
   <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/vim.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="x86/grub.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: OK/final-system/x86_64-64/bin86.xml
===================================================================
--- BOOK/final-system/x86_64-64/bin86.xml	(revision 41969c7b7468101e2d5e82c2a4777c901c825f22)
+++ 	(revision )
@@ -1,118 +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-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>
-
-  </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: OK/final-system/x86_64-64/lilo.xml
===================================================================
--- BOOK/final-system/x86_64-64/lilo.xml	(revision 41969c7b7468101e2d5e82c2a4777c901c825f22)
+++ 	(revision )
@@ -1,115 +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-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>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Lilo</title>
-<!--
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../../final-system/x86/grub.xml"
-     xpointer="xpointer(//*[@os='n1'])"/>
--->
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make all</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't do this as it has no use. The
-      /etc/lilo.conf isn'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>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 41969c7b7468101e2d5e82c2a4777c901c825f22)
+++ BOOK/introduction/common/changelog.xml	(revision 34be04a6cab56e5abf0198256fbbb5f8c056c7f6)
@@ -40,4 +40,8 @@
       <para>August 08, 2010</para>
       <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Removed Lilo and bin86 from x86_64-64 in favor
+          of GRUB.</para>
+        </listitem>
         <listitem>
           <para>[jciccone] - Updated the GCC Pure64 Patch to -2. -1 has
Index: BOOK/materials/x86_64-64/packages.xml
===================================================================
--- BOOK/materials/x86_64-64/packages.xml	(revision 41969c7b7468101e2d5e82c2a4777c901c825f22)
+++ BOOK/materials/x86_64-64/packages.xml	(revision 34be04a6cab56e5abf0198256fbbb5f8c056c7f6)
@@ -13,21 +13,7 @@
   <variablelist role="materials">
 
-    <varlistentry>
-      <term>Bin86 (&bin86-version;) - <token>&bin86-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&bin86-home;"/></para>
-        <para>Download: <ulink url="&bin86-url;"/></para>
-        <para>MD5 sum: <literal>&bin86-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Lilo (&lilo-version;) - <token>&lilo-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&lilo-home;"/></para>
-        <para>Download: <ulink url="&lilo-url;"/></para>
-        <para>MD5 sum: <literal>&lilo-md5;</literal></para>
-      </listitem>
-    </varlistentry>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/packages.xml"
+    xpointer="xpointer(//*[@os='grub'])"/>
 
   </variablelist>
Index: BOOK/materials/x86_64-64/patches.xml
===================================================================
--- BOOK/materials/x86_64-64/patches.xml	(revision 41969c7b7468101e2d5e82c2a4777c901c825f22)
+++ BOOK/materials/x86_64-64/patches.xml	(revision 34be04a6cab56e5abf0198256fbbb5f8c056c7f6)
@@ -12,13 +12,4 @@
 
   <variablelist role="materials">
-
-    <varlistentry os="bin86 x86_64-patch">
-      <term>Bin86 x86_64 Patch - <token>&bin86-x86_64-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&bin86-x86_64-patch;"/></para>
-        <para>MD5 sum: <literal>&bin86-x86_64-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
 
     <varlistentry os="gcc-pure64-patch">
@@ -40,13 +31,4 @@
     </varlistentry>
 
-    <varlistentry os="lilo-cross-x86_64-patch">
-      <term>Lilo x86_64 Cross Compile Patch - <token>&lilo-cross-x86_64-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&lilo-cross-x86_64-patch;"/></para>
-        <para>MD5 sum: <literal>&lilo-cross-x86_64-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
   </variablelist>
 
Index: BOOK/materials/x86_64/packages.xml
===================================================================
--- BOOK/materials/x86_64/packages.xml	(revision 41969c7b7468101e2d5e82c2a4777c901c825f22)
+++ BOOK/materials/x86_64/packages.xml	(revision 34be04a6cab56e5abf0198256fbbb5f8c056c7f6)
@@ -11,7 +11,11 @@
   <title>Additional Packages for x86_64 Multilib</title>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/packages.xml"
-  xpointer="xpointer(//*[@role='materials'])"/>
+  <variablelist role="materials">
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/packages.xml"
+    xpointer="xpointer(//*[@os='grub'])"/>
+
+  </variablelist>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision 41969c7b7468101e2d5e82c2a4777c901c825f22)
+++ BOOK/packages.ent	(revision 34be04a6cab56e5abf0198256fbbb5f8c056c7f6)
@@ -36,10 +36,4 @@
 <!ENTITY bash-md5 "9800d8724815fd84994d9be65ab5e7b8">
 <!ENTITY bash-home "&gnu-software;bash">
-
-<!ENTITY bin86-version "0.16.17">
-<!ENTITY bin86-size "148 KB">
-<!ENTITY bin86-url "http://homepage.ntlworld.com/robert.debath/dev86/bin86-&bin86-version;.tar.gz">
-<!ENTITY bin86-md5 "c9e8d72dd2e7457b52d0e3164fc199a1">
-<!ENTITY bin86-home "http://homepage.ntlworld.com/robert.debath">
 
 <!ENTITY binutils-version "2.20.1">
@@ -252,11 +246,4 @@
 <!ENTITY libtool-md5 "2eba13ecd07653d0e34d4efe8e2974d8">
 <!ENTITY libtool-home "&gnu-software;libtool">
-
-<!ENTITY lilo-version "22.8">
-<!ENTITY lilo-size "427 KB">
-<!ENTITY lilo-url "ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/lilo-&lilo-version;.src.tar.gz">
-<!ENTITY lilo-md5 "72765f2aafd20e23ecf07ebd22baeec7">
-<!-- appears to be dead 	<!ENTITY lilo-home "http://lilo.go.dyndns.org"> -->
-<!ENTITY lilo-home " ">
 
 <!ENTITY linux-dl-version "2.6">
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision 41969c7b7468101e2d5e82c2a4777c901c825f22)
+++ BOOK/patches.ent	(revision 34be04a6cab56e5abf0198256fbbb5f8c056c7f6)
@@ -162,12 +162,2 @@
 <!ENTITY silo-fixes-patch-md5 "03e8897c5d33d0e6ee81e8e8aeeb772f">
 <!ENTITY silo-fixes-patch-size "696 KB">
-
-<!-- Start of x86/x86_64 patches -->
-
-<!ENTITY bin86-x86_64-patch "bin86-&bin86-version;-x86_64-1.patch">
-<!ENTITY bin86-x86_64-patch-md5 "92bdce7b0655cd2e9f83c83fc56d128e">
-<!ENTITY bin86-x86_64-patch-size "1 KB">
-
-<!ENTITY lilo-cross-x86_64-patch "lilo-&lilo-version;-cross_compile_x86_64-2.patch">
-<!ENTITY lilo-cross-x86_64-patch-md5 "a7440e18ef7fa6c5d1c6181dc0cc4d10">
-<!ENTITY lilo-cross-x86_64-patch-size "2 KB">
Index: tches/bin86-0.16.17-x86_64-1.patch
===================================================================
--- patches/bin86-0.16.17-x86_64-1.patch	(revision 41969c7b7468101e2d5e82c2a4777c901c825f22)
+++ 	(revision )
@@ -1,44 +1,0 @@
-Submitted By: Ken Moffat <ken@kenmoffat.uklinux.net>
-Date: 2005-06-28
-Initial Package Version: 0.16.14
-Upstream Status: Submitted Upstream
-Origin: from ROCK Linux
-Description: Allows bin86 to compile on x86_64, which permits lilo to
- be used in a 64-bit system.  I'm dubious about ROCK's attempts to
- automatically add dual-licensing to all their patches, but bin86 is
- already GPL'd.  I've heard from the maintainer that this will be
- included in the next upload.
-
-
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/x86/bin86/x86_64.patch
-# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-diff -urN bin86-0.16.14-orig/ld/x86_aout.h bin86-0.16.14/ld/x86_aout.h
---- bin86-0.16.14-orig/ld/x86_aout.h	2004-11-07 20:07:31.506442000 +0100
-+++ bin86-0.16.14/ld/x86_aout.h	2004-11-07 20:07:41.106982496 +0100
-@@ -12,6 +12,9 @@
- #if defined(i386) || defined(__BCC__) || defined(MSDOS)
- typedef long Long;
- #define __OUT_OK 1
-+#elif defined(__x86_64__)
-+typedef int Long;
-+#define __OUT_OK 1
- #else
- typedef char Long[4];
- #endif
Index: tches/lilo-22.8-cross_compile_x86_64-2.patch
===================================================================
--- patches/lilo-22.8-cross_compile_x86_64-2.patch	(revision 41969c7b7468101e2d5e82c2a4777c901c825f22)
+++ 	(revision )
@@ -1,88 +1,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2006-03-11
-Initial Package Version: 22.7.1
-Upstream Status: Not submitted, purely for cross-compiling for x86_64(-64)
-Origin: Self
-Description: Allows lilo-static to be built with a cross-compiler (plus
- cross as86, ld86).
-
-diff -Nru lilo-22.8-ori/checkit lilo-22.8/checkit
---- lilo-22.8-ori/checkit	2006-08-13 21:24:45.000000000 +0200
-+++ lilo-22.8/checkit	2007-02-27 07:53:07.000000000 +0100
-@@ -58,29 +58,29 @@
- 
- echo
- echo AS86 version $dev or later is required
--as86 -v 1>foo1 2>foo2
-+x86_64-unknown-linux-gnu-as86 -v 1>foo1 2>foo2
- A=`cat foo1 foo2 | grep version | cut -d " " -f 3`
- rm -f foo1 foo2
- if [ -z $A ]; then
--	echo as86 is not present
-+	echo x86_64-unknown-linux-gnu-as86 is not present
- 	ret=1
- else
- 	vers_min $A $dev
--	echo as86 version $A
-+	echo x86_64-unknown-linux-gnu-as86 version $A
- 	if [ $rc = 0 ]; then echo OKAY; else echo ERROR; ret=1; fi
- fi
- 
- echo
- echo LD86 version $dev or later is required
--ld86 -v 1>foo1 2>foo2
-+x86_64-unknown-linux-gnu-ld86 -v 1>foo1 2>foo2
- L=`cat foo1 foo2 | grep version | cut -d " " -f 3`
- rm -f foo1 foo2
- if [ -z $L ]; then
--	echo ld86 is not present
-+	echo x86_64-unknown-linux-gnu-ld86 is not present
- 	ret=1
- else
- 	vers_min $L $dev
--	echo ld86 version $L
-+	echo x86_64-unknown-linux-gnu-ld86 version $L
- 	if [ $rc = 0 ]; then echo OKAY; else echo ERROR; ret=1; fi
- fi
- 
-diff -Nru lilo-22.8-ori/Makefile lilo-22.8/Makefile
---- lilo-22.8-ori/Makefile	2007-02-19 18:15:10.000000000 +0100
-+++ lilo-22.8/Makefile	2007-02-27 07:57:03.000000000 +0100
-@@ -101,18 +101,18 @@
-   cat $$ROOT/etc/lilo.defines; else echo $(CONFIG); fi ) | \
-   sed 's/-D/-DLCF_/g'`
- LILO=-DLILO=0xbb920890
--KVER=`if [ -f /usr/include/linux/version.h ]; then echo -DHAS_VERSION_H; fi`
--HDM=`if [ -f /usr/include/libdevmapper.h ]; then echo -DHAS_LIBDEVMAPPER_H; fi`
--DEVMAPPER=`if [ -f /usr/include/libdevmapper.h ]; then echo "-ldevmapper"; fi`
-+KVER=
-+HDM=
-+DEVMAPPER=
- 
- TMP=_TmP_
- 
- 
- SHELL=/bin/sh
--CC=gcc
-+#CC=gcc
- CPP=$(CC) -E
--AS86=as86 -0 -a
--LD86=ld86 -0
-+AS86=x86_64-unknown-linux-gnu-as86 -0 -a
-+LD86=x86_64-unknown-linux-gnu-ld86 -0
- NASM=nasm
- G=`cat foo1 foo2 | grep version | cut -d " " -f 3`
- 
-@@ -471,10 +471,10 @@
- 		mv tmp_make Makefile
- 
- version:	common.c lilo.h common.h
--		$(CC) $(CFLAGS) -DSHS_MAIN -o version common.c
-+		gcc $(CFLAGS) -DSHS_MAIN -o version common.c
- 
- mkloader:	temp.c
--		$(CC) $(CFLAGS) -DLILO_BINARY -o mkloader temp.c
-+		gcc $(CFLAGS) -DLILO_BINARY -o mkloader temp.c
- 
- tidy:
- 		rm -f core $(LIS) *.shs *.crc $(TMP)*
