diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c8d6d87c8..5ca23becb 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -57,6 +57,10 @@ first a summary, then a detailed log.</para>
 <itemizedlist>
 <listitem><para>coreutils-5.2.1-dupes-1.patch</para></listitem>
 <listitem><para>flex-2.5.31-debian-fixes-2.patch</para></listitem>
+<listitem><para>hotplug-2004_04_01</para></listitem>
+<listitem><para>hotplug-2004_04_01-bogus-deps-1.patch</para></listitem>
+<listitem><para>hotplug-2004_04_01-device-2.patch</para></listitem>
+<listitem><para>hotplug-2004_04_01-isapnp-2.patch</para></listitem>
 <listitem><para>iana-etc-1.00</para></listitem>
 <listitem><para>inetutils-1.4.2-kernel-headers-1.patch</para></listitem>
 <listitem><para>inetutils-1.4.2-no-server-man-pages-1.patch</para></listitem>
@@ -72,7 +76,6 @@ first a summary, then a detailed log.</para>
 <listitem><para>udev-025</para></listitem>
 <listitem><para>udev-025-config-2.patch</para></listitem>
 <listitem><para>util-linux-2.12a-kernel-headers-1.patch</para></listitem>
-<listitem><para>hotplug-2004_04_01</para></listitem>
 </itemizedlist>
 </listitem>
  
@@ -99,6 +102,10 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>May 20th, 2004 [winkie]: Dropped Hotplug's
+<quote>cosmetic</quote> patch in favor of the script from LFS-Bootscripts and
+some general textual/rendering cleanups.</para></listitem>
+
 <listitem><para>May 20th, 2004 [winkie]: Point to the correct GCC patches.
 </para></listitem>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 5e6fe72bd..035f0b8c8 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -64,28 +64,21 @@ following:</para>
 </varlistentry>
 
 <varlistentry>
-<term>Hotplug patch that eliminates bogus dependencies - 1 KB:</term>
+<term>Hotplug Bogus Dependencies Patch- 1 KB:</term>
 <listitem>
 <para><ulink url="&patches-root;hotplug-&hotplug-version;-bogus-deps-1.patch"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term>Hotplug patch that makes the initscript consistent with the rest - 1 KB:</term>
-<listitem>
-<para><ulink url="&patches-root;hotplug-&hotplug-version;-cosmetic-2.patch"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Hotplug patch that fixes USB cold plugging - 1 KB:</term>
+<term>Hotplug Fix for USB Coldplugging - 1 KB:</term>
 <listitem>
 <para><ulink url="&patches-root;hotplug-&hotplug-version;-device-2.patch"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
-<term>Hotplug patch that adds ISAPNP hardware detection (optional) - 1 KB:</term>
+<term>Hotplug ISAPNP Coldplugging Patch - 1 KB:</term>
 <listitem>
 <para><ulink url="&patches-root;hotplug-&hotplug-version;-isapnp-2.patch"/></para>
 </listitem>
diff --git a/chapter06/hotplug.xml b/chapter06/hotplug.xml
index dcc704950..e1d544798 100644
--- a/chapter06/hotplug.xml
+++ b/chapter06/hotplug.xml
@@ -3,7 +3,7 @@
   <!ENTITY % general-entities SYSTEM "../general.ent">
   %general-entities;
 ]>
-<sect1 id="ch-system-hotplug" role="wrap">
+<sect1 id="ch-system-hotplug" xreflabel="Hotplug" role="wrap">
 <title>Hotplug-&hotplug-version;</title>
 <?dbhtml filename="hotplug.html"?>
 
@@ -27,35 +27,20 @@ modules into the running kernel.
 <sect2 role="installation">
 <title>Installation of Hotplug</title>
 
-<para>
-By default, Hotplug does not output anything in its initscript and places it
-into
-<filename class="directory">/etc/init.d</filename>,
-whereas the place for initscripts in LFS is
-<filename class="directory">/etc/rc.d/init.d</filename>. Apply the patch
-that makes the output of hotplug initscript more verbose and places this
-initscript into the proper directory:
-</para>
-
-<screen><userinput>patch -Np1 -i ../hotplug-&hotplug-version;-cosmetic-2.patch
-</userinput></screen>
-
 <para>
 Apply the patch that avoids bogus dependencies of the hotplug initscript
 upon <application>which</application> and
 <application>usbutils</application> packages:
 </para>
 
-<screen><userinput>patch -Np1 -i ../hotplug-&hotplug-version;-bogus-deps-1.patch
-</userinput></screen>
+<screen><userinput>patch -Np1 -i ../hotplug-&hotplug-version;-bogus-deps-1.patch</userinput></screen>
 
 <para>
 USB coldplugging is somewhat broken in Hotplug by default. Fix this with the
 following patch:
 </para>
 
-<screen><userinput>patch -Np1 -i ../hotplug-&hotplug-version;-device-2.patch
-</userinput></screen>
+<screen><userinput>patch -Np1 -i ../hotplug-&hotplug-version;-device-2.patch</userinput></screen>
 
 <para>
 At last, there is an optional patch that adds ISAPNP hardware detection
@@ -71,10 +56,10 @@ run the following command:
 
 <screen><userinput>make install</userinput></screen>
 
-<para>Make a symbolic link that tells the lfs-bootscripts package to run the
-hotplug initscript after mounting and cleaning filesystems:</para>
+<para>Remove hotplug's not-so-clean init script, since we're going to be using
+the script including with LFS-Bootscripts:</para>
 
-<screen><userinput>ln -sf ../init.d/hotplug /etc/rc.d/init.d/S55hotplug</userinput></screen>
+<screen><userinput>rm -rf /etc/init.d</userinput></screen>
 
 <para>
 If you have applied the ISAPNP patch, add some required entries to
diff --git a/chapter07/bootscripts.xml b/chapter07/bootscripts.xml
index 6982e698d..fee55dbbe 100644
--- a/chapter07/bootscripts.xml
+++ b/chapter07/bootscripts.xml
@@ -31,6 +31,10 @@
 
 <screen><userinput>make install</userinput></screen>
 
+<para>Also install hotplug's boot script:</para>
+
+<screen><userinput>make install-hotplug</userinput></screen>
+
 </sect2>