diff --git a/appendixa/bootscripts.xml b/appendixa/bootscripts.xml
index 9260eb21b..2f23951b3 100644
--- a/appendixa/bootscripts.xml
+++ b/appendixa/bootscripts.xml
@@ -2,7 +2,7 @@
 <title>LFS-Bootscripts</title>
 <?dbhtml filename="bootscripts.html" dir="appendixa"?>
 
-<para>For installation instructions see <xref linkend="ch06-bootscripts"/>.</para>
+<para>For installation instructions see <xref linkend="ch06-lfs-bootscripts"/>.</para>
 
 &aa-bootscripts-down;
 &aa-bootscripts-shortdesc;
diff --git a/appendixa/makedev.xml b/appendixa/makedev.xml
index 206fe934b..b378e7ff7 100644
--- a/appendixa/makedev.xml
+++ b/appendixa/makedev.xml
@@ -2,7 +2,7 @@
 <title>MAKEDEV</title>
 <?dbhtml filename="makedev.html" dir="appendixa"?>
 
-<para>For installation instructions see <xref linkend="ch06-makedev"/>.</para>
+<para>For installation instructions see <xref linkend="ch06-MAKEDEV"/>.</para>
 
 &aa-makedev-down;
 &aa-makedev-shortdesc;
diff --git a/appendixa/manpages.xml b/appendixa/manpages.xml
index 1b59ce7ed..18d9168a8 100644
--- a/appendixa/manpages.xml
+++ b/appendixa/manpages.xml
@@ -2,7 +2,7 @@
 <title>Man-pages</title>
 <?dbhtml filename="man-pages.html" dir="appendixa"?>
 
-<para>For installation instructions see <xref linkend="ch06-manpages"/>.</para>
+<para>For installation instructions see <xref linkend="ch06-man-pages"/>.</para>
 
 &aa-manpages-down;
 &aa-manpages-shortdesc;
diff --git a/appendixa/nettools.xml b/appendixa/nettools.xml
index 15b633bb1..1e31546aa 100644
--- a/appendixa/nettools.xml
+++ b/appendixa/nettools.xml
@@ -2,7 +2,7 @@
 <title>Net-tools</title>
 <?dbhtml filename="net-tools.html" dir="appendixa"?>
 
-<para>For installation instructions see <xref linkend="ch06-nettools"/>.</para>
+<para>For installation instructions see <xref linkend="ch06-net-tools"/>.</para>
 
 &aa-nettools-down;
 &aa-nettools-shortdesc;
diff --git a/appendixa/utillinux.xml b/appendixa/utillinux.xml
index 0f53e0bab..006a791d8 100644
--- a/appendixa/utillinux.xml
+++ b/appendixa/utillinux.xml
@@ -2,7 +2,7 @@
 <title>Util-linux</title>
 <?dbhtml filename="util-linux.html" dir="appendixa"?>
 
-<para>For installation instructions see <xref linkend="ch06-utillinux"/>.</para>
+<para>For installation instructions see <xref linkend="ch06-util-linux"/>.</para>
 
 &aa-utillinux-down;
 &aa-utillinux-shortdesc;
diff --git a/chapter05/utillinux.xml b/chapter05/utillinux.xml
index 841721679..a104fd52d 100644
--- a/chapter05/utillinux.xml
+++ b/chapter05/utillinux.xml
@@ -1,4 +1,4 @@
-<sect1 id="ch05-utillinux">
+<sect1 id="ch05-util-linux">
 <title>Installing Util-linux-&util-linux-version;</title>
 <?dbhtml filename="util-linux.html" dir="chapter05"?>
 
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 872fff1ab..743e7358b 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -25,7 +25,7 @@ everything is set up correctly by performing a simple test:</para>
 <para>Your chroot environment is not set up for proper PTY operation. In this
 case there is no point in running the test suites for Binutils and GCC until you
 are able to resolve the issue. Please refer back to <xref linkend="ch06-proc"/>
-and <xref linkend="ch06-makedev"/> and perform the recommended steps to fix the
+and <xref linkend="ch06-MAKEDEV"/> and perform the recommended steps to fix the
 problem.</para>
 
 <note><para>The test suite for Binutils in this section is considered
diff --git a/chapter06/bootscripts.xml b/chapter06/bootscripts.xml
index 6c3a21963..504b4ce4c 100644
--- a/chapter06/bootscripts.xml
+++ b/chapter06/bootscripts.xml
@@ -1,4 +1,4 @@
-<sect1 id="ch06-bootscripts">
+<sect1 id="ch06-lfs-bootscripts">
 <title>Installing LFS-Bootscripts-&bootscripts-version;</title>
 <?dbhtml filename="bootscripts.html" dir="chapter06"?>
 
diff --git a/chapter06/kernel.xml b/chapter06/kernel.xml
index b03c7adc7..3e3b50093 100644
--- a/chapter06/kernel.xml
+++ b/chapter06/kernel.xml
@@ -1,4 +1,4 @@
-<sect1 id="ch06-kernel">
+<sect1 id="ch06-kernel-headers">
 <title>Installing Linux-&kernel-version; headers</title>
 <?dbhtml filename="kernel.html" dir="chapter06"?>
 
diff --git a/chapter06/makedev.xml b/chapter06/makedev.xml
index acb766683..424d727a8 100644
--- a/chapter06/makedev.xml
+++ b/chapter06/makedev.xml
@@ -1,4 +1,4 @@
-<sect1 id="ch06-makedev">
+<sect1 id="ch06-MAKEDEV">
 <title>Creating devices (Makedev-&makedev-version;)</title>
 <?dbhtml filename="makedev.html" dir="chapter06"?>
 
diff --git a/chapter06/manpages.xml b/chapter06/manpages.xml
index 699f68b74..bb8715bb2 100644
--- a/chapter06/manpages.xml
+++ b/chapter06/manpages.xml
@@ -1,4 +1,4 @@
-<sect1 id="ch06-manpages">
+<sect1 id="ch06-man-pages">
 <title>Installing Man-pages-&man-pages-version;</title>
 <?dbhtml filename="man-pages.html" dir="chapter06"?>
 
diff --git a/chapter06/nettools.xml b/chapter06/nettools.xml
index 61a6359d6..e4fc358be 100644
--- a/chapter06/nettools.xml
+++ b/chapter06/nettools.xml
@@ -1,4 +1,4 @@
-<sect1 id="ch06-nettools">
+<sect1 id="ch06-net-tools">
 <title>Installing Net-tools-&net-tools-version;</title>
 <?dbhtml filename="net-tools.html" dir="chapter06"?>
 
diff --git a/chapter06/utillinux.xml b/chapter06/utillinux.xml
index 8689c09a6..62a514511 100644
--- a/chapter06/utillinux.xml
+++ b/chapter06/utillinux.xml
@@ -1,4 +1,4 @@
-<sect1 id="ch06-utillinux">
+<sect1 id="ch06-util-linux">
 <title>Installing Util-linux-&util-linux-version;</title>
 <?dbhtml filename="util-linux.html" dir="chapter06"?>
 
diff --git a/index.xml b/index.xml
index 7d2ef2666..f1d42f023 100644
--- a/index.xml
+++ b/index.xml
@@ -3,8 +3,8 @@
 				"/usr/share/docbook/docbookx.dtd" [
 
 
-<!ENTITY version "CVS-20031222">
-<!ENTITY releasedate "December 22nd, 2003">
+<!ENTITY version "CVS-20040102">
+<!ENTITY releasedate "January 2nd, 2004">
 <!ENTITY milestone "5.1">
 <!ENTITY nbsp " ">