diff --git a/debian/changelog b/debian/changelog
index 5b7063f6..357e6b42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -100,7 +100,10 @@ debian-cd (3.0.4) UNRELEASED; urgency=low
   * New OMIT_DOC_TOOLS option to be able to work with mirrors that do not
     contain the doc and tools directories.
 
- -- Otavio Salvador <otavio@ossystems.com.br>  Thu, 14 Feb 2008 12:27:58 -0200
+  [ Frans Pop ]
+  * Ensure that the correct version of the Installation Guide is included.
+
+ -- Frans Pop <fjp@debian.org>  Fri, 07 Mar 2008 10:26:22 +0100
 
 debian-cd (3.0.3) unstable; urgency=low
 
diff --git a/tools/Packages-gen.sh b/tools/Packages-gen.sh
new file mode 100755
index 00000000..2cdf62fe
--- /dev/null
+++ b/tools/Packages-gen.sh
@@ -0,0 +1,29 @@
+#! /bin/sh
+set -e
+
+if [ ! -d $LOCALDEBS ]; then
+	echo "error: LOCALDEBS variable not set"
+	exit 1
+fi
+cd $LOCALDEBS
+
+distr=$1
+if [ -z "$distr" ]; then
+	echo "Usage: $(basename $0) <codename>"
+	exit 1
+elif [ ! -d dists/$distr/local/ ]; then
+	echo "No local repository matching '$distr' was found"
+	exit 1
+fi
+
+for repo in dists/$distr/local/binary-*; do
+	[ -d $repo ] || break
+	echo Creating Packages file for $repo...
+	apt-ftparchive packages $repo | gzip >$repo/Packages.gz
+done
+for repo in dists/$distr/local/debian-installer/binary-*; do
+	[ -d $repo ] || break
+	echo Creating Packages file for $repo...
+	apt-ftparchive packages $repo | gzip >$repo/Packages.gz
+done
+echo "Done."
diff --git a/tools/etch/installtools.sh b/tools/etch/installtools.sh
index adeecb1b..24dcfbff 100755
--- a/tools/etch/installtools.sh
+++ b/tools/etch/installtools.sh
@@ -14,7 +14,7 @@ NUM_ARCHES=`echo $ARCHES | wc -w`
 
 if [ "$OMIT_MANUAL" != 1 ]; then
 	DOCDIR=doc
-    MANTDIR=$TDIR/installguide
+	MANTDIR=$TDIR/installguide
 
 	for ARCH in $ARCHES
 	do
@@ -25,8 +25,7 @@ if [ "$OMIT_MANUAL" != 1 ]; then
 				INSTALLDIR=$DIR/$DOCDIR/manual/$ARCH
 			fi
 
-	        DOCS=$MIRROR/dists/$DI_CODENAME/main/installer-$ARCH/current/$DOCDIR
-            INSTALLGUIDE=$(zcat $MIRROR/dists/etch/main/binary-$ARCH//Packages.gz | \
+            INSTALLGUIDE=$(zcat $MIRROR/dists/$CODENAME/main/binary-$ARCH//Packages.gz | \
                 sed -n "s/Filename: \(pool\/main\/i\/installation-guide\/installation-guide-$ARCH.*deb\)$/\1/p")
 
             if [ -f "$MIRROR/$INSTALLGUIDE" ]; then
diff --git a/tools/lenny/installtools.sh b/tools/lenny/installtools.sh
index adeecb1b..24dcfbff 100755
--- a/tools/lenny/installtools.sh
+++ b/tools/lenny/installtools.sh
@@ -14,7 +14,7 @@ NUM_ARCHES=`echo $ARCHES | wc -w`
 
 if [ "$OMIT_MANUAL" != 1 ]; then
 	DOCDIR=doc
-    MANTDIR=$TDIR/installguide
+	MANTDIR=$TDIR/installguide
 
 	for ARCH in $ARCHES
 	do
@@ -25,8 +25,7 @@ if [ "$OMIT_MANUAL" != 1 ]; then
 				INSTALLDIR=$DIR/$DOCDIR/manual/$ARCH
 			fi
 
-	        DOCS=$MIRROR/dists/$DI_CODENAME/main/installer-$ARCH/current/$DOCDIR
-            INSTALLGUIDE=$(zcat $MIRROR/dists/etch/main/binary-$ARCH//Packages.gz | \
+            INSTALLGUIDE=$(zcat $MIRROR/dists/$CODENAME/main/binary-$ARCH//Packages.gz | \
                 sed -n "s/Filename: \(pool\/main\/i\/installation-guide\/installation-guide-$ARCH.*deb\)$/\1/p")
 
             if [ -f "$MIRROR/$INSTALLGUIDE" ]; then