diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index dfeb25f8f..2335b2ea5 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -30,7 +30,6 @@ first a summary, then a detailed log.</para>
 <listitem><para>gcc-3.4.2</para></listitem>
 <listitem><para>glibc-2.3.4-20040828</para></listitem>
 <listitem><para>groff-1.19.1</para></listitem>
-<listitem><para>hotplug-2004_04_01</para></listitem>
 <listitem><para>iana-etc-1.02</para></listitem>
 <listitem><para>lfs-bootscripts-2.2.3</para></listitem>
 <listitem><para>libtool-1.5.10</para></listitem>
@@ -55,7 +54,7 @@ first a summary, then a detailed log.</para>
 <listitem><para>coreutils-5.2.1-suppress_hostname_uptime_kill_su-1.patch</para></listitem>
 <listitem><para>flex-2.5.31-debian_fixes-2.patch</para></listitem>
 <listitem><para>gcc-3.4.2-linkonce-1.patch</para></listitem>
-<listitem><para>hotplug-2004_09_20</para></listitem>
+<listitem><para>hotplug-2004_09_23</para></listitem>
 <listitem><para>inetutils-1.4.2-kernel_headers-1.patch</para></listitem>
 <listitem><para>iproute2-2.6.8-040823</para></listitem>
 <listitem><para>iproute2-2.6.8-040823-remove_db-1.patch</para></listitem>
@@ -93,6 +92,9 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>September 25th, 2004 [jeremy]: Upgraded to hotplug-2004_09_23.
+This includes Alexander's improved isapnp detection script.</para></listitem>
+
 <listitem><para>September 23rd, 2004 [jeremy]: Added a sed to hotplug to fix
 the return 0 syntax error in isapnp.rc.  Assistance on this courtesy of Chris
 Lingard and Alexander Patrakov.</para></listitem>
diff --git a/chapter06/hotplug.xml b/chapter06/hotplug.xml
index 620ca9fe2..a702f43a0 100644
--- a/chapter06/hotplug.xml
+++ b/chapter06/hotplug.xml
@@ -28,12 +28,6 @@ boot and inserts the relevant modules into the running kernel.
 <sect2 role="installation">
 <title>Installation of Hotplug</title>
 
-<para>The isapnp.rc script included with hotplug has a minor syntax error,
-using return 0 outside a function definition where exit 0 should be used.
-The following command fixes this:</para>
-
-<screen><userinput>sed -i "s/|| return 0/|| exit 0/g" etc/hotplug/isapnp.rc</userinput></screen>
-
 <para>Install the Hotplug package:</para>
 
 <screen><userinput>make install</userinput></screen>
diff --git a/general.ent b/general.ent
index f13e58be3..fb89fc5f7 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20040923">
-<!ENTITY releasedate "September 23, 2004">
+<!ENTITY version "SVN-20040925">
+<!ENTITY releasedate "September 25, 2004">
 <!ENTITY milestone "6.1">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
@@ -38,7 +38,7 @@
 <!ENTITY groff-version "1.19.1">
 <!ENTITY grub-version "0.95">
 <!ENTITY gzip-version "1.3.5">
-<!ENTITY hotplug-version "2004_09_20">
+<!ENTITY hotplug-version "2004_09_23">
 <!ENTITY iana-etc-version "1.02">
 <!ENTITY inetutils-version "1.4.2">
 <!ENTITY iproute2-version "2.6.9-ss040831">