diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 45bc38934..a0da0b413 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,11 @@
     <listitem>
       <para>2009-05-16</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Make symbolic links installed by bzip2 relative.
+          Fixes
+          <ulink url="&lfs-ticket-root;2396">#2396</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Add creation of
           <filename>/etc/modprobe.conf</filename> to prevent ohci_hcd and
diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index 779f3702e..63af5e009 100644
--- a/chapter06/bzip2.xml
+++ b/chapter06/bzip2.xml
@@ -47,6 +47,10 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../&bzip2-docs-patch;</userinput></screen>
 
+   <para>The following command ensures installation of symbolic links are relative:</para>
+
+<screen><userinput remap="pre">sed -i 's@\(ln -s -f \)$(PREFIX)/bin/@\1@' Makefile</userinput></screen>
+
     <para>Prepare Bzip2 for compilation with:</para>
 
 <screen><userinput remap="make">make -f Makefile-libbz2_so
diff --git a/general.ent b/general.ent
index 13b8bd895..341dfdf5c 100644
--- a/general.ent
+++ b/general.ent
@@ -2,7 +2,7 @@
 <!ENTITY version "SVN-20090516">
 <!ENTITY releasedate "May 16, 2009">
 <!ENTITY copyrightdate "1999-2009"><!-- jhalfs needs a literal dash, not &ndash; -->
-<!ENTITY milestone "7.0">
+<!ENTITY milestone "6.5">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">