Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision c863747472e09d02388ff2f5a1fd7ab63d7b8d61)
+++ chapter01/changelog.xml	(revision cdfb4609c989fe08fc8957930e60692647138923)
@@ -20,25 +20,28 @@
 <listitem><para>Upgraded to:</para>
 <itemizedlist>
-<listitem><para>automake-1.9</para></listitem>
+<listitem><para>automake-1.9.1</para></listitem>
 <listitem><para>bash-3.0</para></listitem>
-<listitem><para>binutils-2.15</para></listitem>
+<listitem><para>binutils-2.15.91.0.2</para></listitem>
 <listitem><para>bison-1.875a</para></listitem>
 <listitem><para>expect-5.42.1</para></listitem>
 <listitem><para>file-4.10</para></listitem>
 <listitem><para>flex-2.5.31</para></listitem>
+<listitem><para>gawk-3.1.4</para></listitem>
 <listitem><para>gcc-3.4.1</para></listitem>
 <listitem><para>glibc-2.3.4-20040701</para></listitem>
 <listitem><para>groff-1.19.1</para></listitem>
-<listitem><para>lfs-bootscripts-2.2.0</para></listitem>
-<listitem><para>linux-2.6.7</para></listitem>
-<listitem><para>m4-1.4.1</para></listitem>
-<listitem><para>man-1.5n</para></listitem>
+<listitem><para>lfs-bootscripts-2.2.2</para></listitem>
+<listitem><para>libtool-1.5.8</para></listitem>
+<listitem><para>linux-2.6.8.1</para></listitem>
+<listitem><para>m4-1.4.2</para></listitem>
+<listitem><para>man-1.5o</para></listitem>
 <listitem><para>man-pages-1.67</para></listitem>
 <listitem><para>perl-5.8.5</para></listitem>
-<listitem><para>procps-3.2.2</para></listitem>
+<listitem><para>procps-3.2.3</para></listitem>
 <listitem><para>psmisc-21.5</para></listitem>
-<listitem><para>sed-4.1.1</para></listitem>
+<listitem><para>sed-4.1.2</para></listitem>
 <listitem><para>tar-1.14</para></listitem>
 <listitem><para>tcl-8.4.7</para></listitem>
+<listitem><para>util-linux-2.12b</para></listitem>
 <listitem><para>vim-6.3</para></listitem>
 </itemizedlist>
@@ -51,7 +54,7 @@
 <listitem><para>flex-2.5.31-debian_fixes-2.patch</para></listitem>
 <listitem><para>inetutils-1.4.2-kernel_headers-1.patch</para></listitem>
-<listitem><para>iproute2-2.6.8-ss040730</para></listitem>
-<listitem><para>iproute2-2.6.8-ss040730-remove_db-1.patch</para></listitem>
-<listitem><para>linux-libc-headers-2.6.7.0</para></listitem>
+<listitem><para>iproute2-2.6.8-040823</para></listitem>
+<listitem><para>iproute2-2.6.8_040823-remove_db-1.patch</para></listitem>
+<listitem><para>linux-libc-headers-2.6.8.1</para></listitem>
 <listitem><para>module-init-tools-3.0</para></listitem>
 <listitem><para>readline-5.0</para></listitem>
@@ -63,5 +66,4 @@
 <listitem><para>udev-config-1.permissions</para></listitem>
 <listitem><para>udev-config-1.rules</para></listitem>
-<listitem><para>util-linux-2.12a-kernel_headers-1.patch</para></listitem>
 <listitem><para>vim-6.3 language files</para></listitem>
 </itemizedlist>
@@ -82,4 +84,10 @@
 </listitem>
 
+<listitem><para>August 29th, 2004 [matt]: Upgraded to autoconf-1.9.1,
+gawk-3.1.4, iproute2-2.6.8-040823, linux-2.6.8.1, m4-1.4.2, man-1.5o,
+procps-3.2.3 (removing unnecessary <command>rm</command> command,
+sed-4.1.2 and util-linux-2.12b (removing kernel-headers patch as the issue has
+been fixed upstream).</para></listitem>
+
 <listitem><para>August 29th, 2004 [gerard]: Added missing SBU for
 readline.</para></listitem>
Index: chapter03/packages.xml
===================================================================
--- chapter03/packages.xml	(revision c863747472e09d02388ff2f5a1fd7ab63d7b8d61)
+++ chapter03/packages.xml	(revision cdfb4609c989fe08fc8957930e60692647138923)
@@ -20,5 +20,5 @@
 
 <varlistentry>
-<term>Automake (&automake-version;) - 644 KB:</term>
+<term>Automake (&automake-version;) - 681 KB:</term>
 <listitem>
 <para><ulink url="&freshmeat;automake/"/></para>
@@ -111,5 +111,5 @@
 
 <varlistentry>
-<term>Gawk (&gawk-version;) - 1,596 KB:</term>
+<term>Gawk (&gawk-version;) - 1,692 KB:</term>
 <listitem>
 <para><ulink url="&freshmeat;gnuawk/"/></para>
@@ -181,5 +181,5 @@
 
 <varlistentry>
-<term>IPRoute2 (&iproute2-version;) - 230 KB:</term>
+<term>IPRoute2 (&iproute2-version;) - 264 KB:</term>
 <listitem>
 <para><ulink url="http://developer.osdl.org/dev/iproute2/download/"/></para>
@@ -216,5 +216,5 @@
 
 <varlistentry>
-<term>Linux (&linux-version;) - 30,051 KB:</term>
+<term>Linux (&linux-version;) - 34,793 KB:</term>
 <listitem>
 <para><ulink url="&freshmeat;linux/"/></para>
@@ -230,5 +230,5 @@
 
 <varlistentry>
-<term>M4 (&m4-version;) - 310 KB:</term>
+<term>M4 (&m4-version;) - 337 KB:</term>
 <listitem>
 <para><ulink url="&freshmeat;gnum4/"/></para>
@@ -244,5 +244,5 @@
 
 <varlistentry>
-<term>Man (&man-version;) - 196 KB:</term>
+<term>Man (&man-version;) - 223 KB:</term>
 <listitem>
 <para><ulink url="&freshmeat;man/"/></para>
@@ -293,5 +293,5 @@
 
 <varlistentry>
-<term>Procps (&procps-version;) - 256 KB:</term>
+<term>Procps (&procps-version;) - 265 KB:</term>
 <listitem>
 <para><ulink url="&freshmeat;procps/"/></para>
@@ -314,5 +314,5 @@
 
 <varlistentry>
-<term>Sed (&sed-version;) - 753 KB:</term>
+<term>Sed (&sed-version;) - 749KB:</term>
 <listitem>
 <para><ulink url="&freshmeat;sed/"/></para>
@@ -384,5 +384,5 @@
 
 <varlistentry>
-<term>Util-linux (&util-linux-version;) - 1,814 KB:</term>
+<term>Util-linux (&util-linux-version;) - 1,921 KB:</term>
 <listitem>
 <para><ulink url="&freshmeat;util-linux/"/></para>
Index: chapter03/patches.xml
===================================================================
--- chapter03/patches.xml	(revision c863747472e09d02388ff2f5a1fd7ab63d7b8d61)
+++ chapter03/patches.xml	(revision cdfb4609c989fe08fc8957930e60692647138923)
@@ -133,11 +133,4 @@
 </varlistentry>
 
-<varlistentry>
-<term>Util-Linux Kernel Headers Patch - 3 KB:</term>
-<listitem>
-<para><ulink url="&patches-root;util-linux-&util-linux-version;-kernel_headers-1.patch"/></para>
-</listitem>
-</varlistentry>
-
 </variablelist>
 
Index: chapter05/util-linux.xml
===================================================================
--- chapter05/util-linux.xml	(revision c863747472e09d02388ff2f5a1fd7ab63d7b8d61)
+++ chapter05/util-linux.xml	(revision cdfb4609c989fe08fc8957930e60692647138923)
@@ -27,9 +27,4 @@
 <sect2 role="installation">
 <title>Installation of Util-linux</title>
-
-<para>Util-linux has issues with the Linux 2.6 kernel series. These
-issues can be fixed by applying the following patch:</para>
-
-<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-kernel_headers-1.patch</userinput></screen>
 
 <para>Util-linux does not use the freshly installed headers and
Index: chapter06/procps.xml
===================================================================
--- chapter06/procps.xml	(revision c863747472e09d02388ff2f5a1fd7ab63d7b8d61)
+++ chapter06/procps.xml	(revision cdfb4609c989fe08fc8957930e60692647138923)
@@ -36,8 +36,4 @@
 
 <screen><userinput>make install</userinput></screen>
-
-<para>Remove a spurious library link:</para>
-
-<screen><userinput>rm /lib/libproc.so</userinput></screen>
 
 </sect2>
Index: chapter06/util-linux.xml
===================================================================
--- chapter06/util-linux.xml	(revision c863747472e09d02388ff2f5a1fd7ab63d7b8d61)
+++ chapter06/util-linux.xml	(revision cdfb4609c989fe08fc8957930e60692647138923)
@@ -45,9 +45,4 @@
 <sect2 role="installation">
 <title>Installation of Util-linux</title>
-
-<para>Util-linux has issues with the Linux 2.6 kernel series. Fix
-these issues by applying the following patch:</para>
-
-<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-kernel_headers-1.patch</userinput></screen>
 
 <para>Prepare Util-linux for compilation:</para>
Index: general.ent
===================================================================
--- general.ent	(revision c863747472e09d02388ff2f5a1fd7ab63d7b8d61)
+++ general.ent	(revision cdfb4609c989fe08fc8957930e60692647138923)
@@ -16,5 +16,5 @@
 
 <!ENTITY autoconf-version "2.59">
-<!ENTITY automake-version "1.9">
+<!ENTITY automake-version "1.9.1">
 <!ENTITY bash-version "3.0">
 <!ENTITY binutils-version "2.15.91.0.2">
@@ -30,5 +30,5 @@
 <!ENTITY findutils-version "4.1.20">
 <!ENTITY flex-version "2.5.31">
-<!ENTITY gawk-version "3.1.3">
+<!ENTITY gawk-version "3.1.4">
 <!ENTITY gcc-version "3.4.1">
 <!ENTITY gettext-version "0.14.1">
@@ -39,15 +39,15 @@
 <!ENTITY gzip-version "1.3.5">
 <!ENTITY iana-etc-version "1.01">
-<!ENTITY iproute2-version "2.6.8-ss040730">
-<!ENTITY iproute2-patch-version "2.6.8_ss040730">
+<!ENTITY iproute2-version "2.6.8-040823">
+<!ENTITY iproute2-patch-version "2.6.8_040823">
 <!ENTITY inetutils-version "1.4.2">
 <!ENTITY kbd-version "1.12">
 <!ENTITY less-version "382">
 <!ENTITY libtool-version "1.5.8">
-<!ENTITY linux-version "2.6.7">
-<!ENTITY linux-libc-headers-version "2.6.7.0">
-<!ENTITY m4-version "1.4.1">
+<!ENTITY linux-version "2.6.8.1">
+<!ENTITY linux-libc-headers-version "2.6.8.0">
+<!ENTITY m4-version "1.4.2">
 <!ENTITY make-version "3.80">
-<!ENTITY man-version "1.5n">
+<!ENTITY man-version "1.5o">
 <!ENTITY man-pages-version "1.67">
 <!ENTITY mktemp-version "1.5">
@@ -56,8 +56,8 @@
 <!ENTITY patch-version "2.5.4">
 <!ENTITY perl-version "5.8.5">
-<!ENTITY procps-version "3.2.2">
+<!ENTITY procps-version "3.2.3">
 <!ENTITY psmisc-version "21.5">
 <!ENTITY readline-version "5.0">
-<!ENTITY sed-version "4.1.1">
+<!ENTITY sed-version "4.1.2">
 <!ENTITY shadow-version "4.0.4.1">
 <!ENTITY sysklogd-version "1.4.1">
@@ -66,5 +66,5 @@
 <!ENTITY tcl-version "8.4.7">
 <!ENTITY texinfo-version "4.7">
-<!ENTITY util-linux-version "2.12a">
+<!ENTITY util-linux-version "2.12b">
 <!ENTITY udev-version "030">
 <!ENTITY vim-version "6.3">
