diff --git a/data/squeeze/README.html.in b/data/squeeze/README.html.in
index 57480765..4bd036af 100644
--- a/data/squeeze/README.html.in
+++ b/data/squeeze/README.html.in
@@ -186,6 +186,7 @@
     possible to install and run Debian with only the Binary-1 disc. The other
     discs, up to Binary-TOTALNUM, contain mostly special-interest programs.</p>
 # endif
+# if (OFFICIAL_VAL == 2)
 #  if OMIT_RELEASE_NOTES
     <p>The Release Notes for "squeeze" are available on the
     <a href="http://www.debian.org/releases/squeeze/releasenotes">Debian web
@@ -203,6 +204,7 @@
 #   endif
 #  endif
 # endif
+# endif
 # if TYPEsource
     This set includes the source code of programs in the Debian OS.</p>
 # endif
@@ -223,6 +225,7 @@
     installation procedure may seem a bit unusual. You can install
     Debian GNU/Linux either <em>alongside</em> your current OS, or as
     the <em>only</em> OS on your computer.</p>
+# if (OFFICIAL_VAL == 2)
 # if OMIT_MANUAL
     <p>An <b>Installation Guide</b> for this disc is available from
     <a href="http://www.debian.org/releases/squeeze/installmanual">the
@@ -241,7 +244,15 @@
     <a href="http://www.debian.org/releases/squeeze/installmanual">the Debian web site</a>.
     </p>
 # endif
+# else
+    <p>As this is not an official squeeze release disc, then the
+    installation guide many not be released yet. It will appear on <a
+    href="http://www.debian.org/releases/squeeze/installmanual">the
+    Debian web site</a> when ready, but before then you could try <a
+    href="http://d-i.alioth.debian.org/manual/">the development
+    version of the manual</a>.
     </p>
+# endif
 
 # if ARCHi386 || ARCHamd64 || ARCHia64 || ARCHalpha || ARCHpowerpc || ARCHsparc
     <p>For the impatient ones: you can start the installation program easily by
diff --git a/debian/changelog b/debian/changelog
index 2c279bad..546edfb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,9 @@ debian-cd (3.1.2) UNRELEASED; urgency=low
   * Recognise and ignore Breaks: lines. Closes: #523444
   * Re-add code to generate install.bat on x86 machines. Thanks to Samuel
     Thibault for the patch. Closes: #518807
+  * Modify README.html: only attempt to link to the release notes and
+    installation manual on release-ready builds, otherwise suggest the
+    alioth version of the installation manual. Closes: #330398
 
  -- Frans Pop <fjp@debian.org>  Sun, 15 Feb 2009 23:41:25 +0100