diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f56713540..a658c9ce3 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -158,6 +158,10 @@ Lfs-Utils-0.4 and Man-pages-1.62</para></listitem>
 no_fixincludes-2.patch to no_fixincludes-1.patch which was the name it is
 supposed to be.</para></listitem>
 
+<listitem><para>November 13th, 2003 [alex]: Chapter 6 - Vim: Changed from
+creating a local <filename>/root/.vimrc</filename> to a system-wide
+<filename>/etc/vimrc</filename> file .</para></listitem>
+
 <listitem><para>November 12th, 2003 [greg]: Removed unnecessary Automake
 symlink.</para></listitem>
 
@@ -168,10 +172,6 @@ Patch. Closes Bug 705.</para></listitem>
 Automake-1.7.9, File-4.06, Modutils-2.4.26, Procps-3.1.14 and
 Sed-4.0.8.</para></listitem>
 
-<listitem><para>November 13th, 2003 [alex]: Chapter 6 - Vim: Changed from
-creating a local <filename>/root/.vimrc</filename> to a system-wide
-<filename>/etc/vimrc</filename> file .</para></listitem>
-
 <listitem><para>November 12th, 2003 [greg]: Upgraded to
 GCC-3.3.2.</para></listitem>
 
diff --git a/entities/book-structure.xml b/entities/book-structure.xml
index dd94fadc6..e42cb7160 100644
--- a/entities/book-structure.xml
+++ b/entities/book-structure.xml
@@ -27,24 +27,10 @@
 <!ENTITY chapter04 SYSTEM "../chapter04/chapter04.xml">
 
 <!ENTITY chapter05 SYSTEM "../chapter05/chapter05.xml">
-<!ENTITY c5-introduction SYSTEM "../chapter05/introduction.xml">
-<!ENTITY c5-toolchaintechnotes SYSTEM "../chapter05/toolchaintechnotes.xml">
-<!ENTITY c5-creatingtoolsdir SYSTEM "../chapter05/creatingstage1dir.xml">
-<!ENTITY c5-addinguser SYSTEM "../chapter05/adding-user.xml">
-<!ENTITY c5-settingenviron SYSTEM "../chapter05/setting-environment.xml">
-<!ENTITY c5-lockingglibc SYSTEM "../chapter05/lockingglibc.xml">
 
 <!ENTITY chapter06 SYSTEM "../chapter06/chapter06.xml">
-<!ENTITY c6-introduction SYSTEM "../chapter06/introduction.xml">
 <!ENTITY c6-aboutdebug SYSTEM "../chapter06/aboutdebug.xml">
-<!ENTITY c6-chroot SYSTEM "../chapter06/chroot.xml">
-<!ENTITY c6-changingowner SYSTEM "../chapter06/changingowner.xml">
-<!ENTITY c6-creatingdirs SYSTEM "../chapter06/creatingdirs.xml">
-<!ENTITY c6-pwdgroup SYSTEM "../chapter06/pwdgroup.xml">
 <!ENTITY c6-mountproc SYSTEM "../chapter06/mountproc.xml">
-<!ENTITY c6-createfiles SYSTEM "../chapter06/createfiles.xml">
-<!ENTITY c6-adjustingtoolchain SYSTEM "../chapter06/adjustingtoolchain.xml">
-<!ENTITY c6-revisedchroot SYSTEM "../chapter06/revisedchroot.xml">
 <!ENTITY c6-cf-keyboard SYSTEM "../chapter06/config-keyboard.xml">
 <!ENTITY c6-cf-password SYSTEM "../chapter06/create-password.xml">