diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 648db5997..7ddfc0c32 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -6,26 +6,6 @@
 
 <itemizedlist>
 
-<listitem><para>August 26, 2003 [jeremy] - Chapter 07 -
-Creating /etc/hosts: Changed www.mydomain.org to 
-&lt;value of HOSTNAME&gt;.mydomain.org</para></listitem>
-
-<listitem><para>August 26, 2003 [jeremy] - Chapter 04 -
-Mounting the LFS partition: Added text regarding mounting
-with too restrictive permissions.</para></listitem>
-
-<listitem><para>August 26, 2003 [jeremy] - Chapter 06 -
-Creating Directories: Added the creation of the /dev/shm
-directory.</para></listitem>
-
-<listitem><para>August 26, 2003 [jeremy] - Chapter 08 -
-Creating fstab: Added the mount of tmpfs filesystem to
-/dev/shm.</para></listitem>
-
-<listitem><para>August 26, 2003 [jeremy] - Chapter 08 -
-Kernel Installation: Added a reminder to compile tmpfs
-support into the kernel.</para></listitem>
-
 <listitem><para>Upgraded to:
 <itemizedlist>
 <listitem><para>automake-1.7.6</para></listitem>
@@ -102,6 +82,18 @@ support into the kernel.</para></listitem>
 </itemizedlist>
 </para></listitem>
 
+<listitem><para>August 26th, 2003 [alex]: Chapter 06 &amp; 08 - Moved the
+installation of the kernel manpages from chapter 6 to 8.</para></listitem>
+
+<listitem><para>August 25th, 2003 [alex]: Chapter 06 - Rewrote the installation
+text of Shadow and Util-Linux while correcting some typos.</para></listitem>
+
+<listitem><para>August 25th, 2003 [alex]: Chapter 05 &amp; 06 - Made the
+"Locking in" and "Re-adjusting" look similar.</para></listitem>
+
+<listitem><para>August 24th, 2003 [alex]: Chapter 04 - Merged the many little
+files into one file. Gave packages and patches a separate page.</para></listitem>
+
 <listitem><para>August 17th, 2003 [alex]: Chapter 05 - From Bash to Perl:
 put text in between commands. Added a section on stripping unneeded
 symbols to decrease the size of the tools.</para></listitem>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index d3843cbb2..b4d9ad8a9 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -63,7 +63,6 @@
 &c6-tar;
 &c6-utillinux;
 &c6-gcc-2953;
-&c6-kernel-manpages;
 &c6-revisedchroot;
 &c6-bootscripts;
 &c6-configure;
diff --git a/chapter06/kernel-manpages-inst.xml b/chapter06/kernel-manpages-inst.xml
deleted file mode 100644
index a9c4ca059..000000000
--- a/chapter06/kernel-manpages-inst.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<sect2>
-<title>Installation of the kernel man pages</title>
-
-<para>Build the manual pages:</para>
-
-<para><screen><userinput>make mandocs</userinput></screen></para>
-
-<para>Install the manual pages:</para>
-
-<para><screen><userinput>cp -a Documentation/man /usr/share/man/man9</userinput></screen></para>
-
-</sect2>
-
diff --git a/chapter06/kernel-manpages.xml b/chapter06/kernel-manpages.xml
deleted file mode 100644
index 7a0fd0951..000000000
--- a/chapter06/kernel-manpages.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<sect1 id="ch06-kernel-manpages">
-<title>Installing Linux-&kernel-version; man pages</title>
-<?dbhtml filename="kernel-manpages.html" dir="chapter06"?>
-
-<screen>Estimated build time:           &kernel-manpages-time;
-Estimated required disk space:  &kernel-manpages-compsize;</screen>
-
-&aa-kernel-shortdesc;
-&c6-kernel-manpages-inst;
-
-</sect1>
-
diff --git a/chapter08/kernel-inst.xml b/chapter08/kernel-inst.xml
index 7b4c0b023..442bbc16f 100644
--- a/chapter08/kernel-inst.xml
+++ b/chapter08/kernel-inst.xml
@@ -31,10 +31,6 @@ system to the
 <filename class="directory">$LFS/usr/src/linux-&kernel-version;</filename>
 directory.</para>
 
-<para>It's important to note that to be compliant with Posix shared memory
-requirements, we must enable the tmpfs filesystem option, and mount a tmpfs
-filesystem at /dev/shm.</para>
-
 <para>Verify dependencies and create dependency information files:</para>
 
 <para><screen><userinput>make CC=/opt/gcc-2.95.3/bin/gcc dep</userinput></screen></para>
@@ -60,6 +56,15 @@ interest to you.</para>
 
 <para><screen><userinput>make CC=/opt/gcc-2.95.3/bin/gcc modules_install</userinput></screen></para>
 
+<para>As nothing is complete without documentation, build the manual pages
+that come with the kernel:</para>
+
+<para><screen><userinput>make mandocs</userinput></screen></para>
+
+<para>And install these pages:</para>
+
+<para><screen><userinput>cp -a Documentation/man /usr/share/man/man9</userinput></screen></para>
+
 <para>Kernel compilation has finished, but some of the files created
 still reside in the source tree. To complete the installation, two
 files should to be copied to the <filename>/boot</filename>
diff --git a/entities/kernel.ent b/entities/kernel.ent
index e52d89239..480143530 100644
--- a/entities/kernel.ent
+++ b/entities/kernel.ent
@@ -6,8 +6,6 @@
 <!ENTITY c6-kernel SYSTEM "../chapter06/kernel.xml">
 <!ENTITY c6-kernel-inst SYSTEM "../chapter06/kernel-inst.xml">
 <!ENTITY c6-kernel-exp-headers SYSTEM "../chapter06/kernel-exp-headers.xml">
-<!ENTITY c6-kernel-manpages SYSTEM "../chapter06/kernel-manpages.xml">
-<!ENTITY c6-kernel-manpages-inst SYSTEM "../chapter06/kernel-manpages-inst.xml">
 
 <!ENTITY c8-kernel SYSTEM "../chapter08/kernel.xml">
 <!ENTITY c8-kernel-inst SYSTEM "../chapter08/kernel-inst.xml">
@@ -29,7 +27,5 @@
 <!ENTITY kernel-time-headers "0.02 SBU">
 
 <!ENTITY kernel-compsize "All default options: 181 MB">
-<!ENTITY kernel-manpages-compsize "To Be Determined">
 <!ENTITY kernel-time "All default options: 4.20 SBU">
-<!ENTITY kernel-manpages-time "0.01 SBU">