diff --git a/debian/changelog b/debian/changelog
index 7cd8bbb2..f98da8f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ debian-cd (2.2.2) frozen unstable; urgency=low
   * Fixed targets bin-image and src-image to use CD$(CD) instead of $(CD).
   * Added "." after -F argument for symlink farm user. Closes: #66599
   * Misc changes for woody i386 bootdisks --jwest
+  * Fixed the patch from Joey. :) ${LOCALDEBS:-$MIRROR} instead of
+    ${LOCALDEBS:-MIRROR}. s/CODNAME/CODENAME/ too.
 
  -- Raphael Hertzog <hertzog@debian.org>  Fri, 30 Jun 2000 17:50:16 +0200
 
diff --git a/tools/apt-selection b/tools/apt-selection
index aec84c68..9b766f6c 100755
--- a/tools/apt-selection
+++ b/tools/apt-selection
@@ -59,7 +59,7 @@ if [ ! -e "$APTTMP/$CODENAME-$ARCH/apt/sources.list" ]; then
 	fi
 	# Local packages ...
 	if [ -n "$LOCAL" ]; then
-	  echo "deb file:${LOCALDEBS:-MIRROR} $CODENAME local" \
+	  echo "deb file:${LOCALDEBS:-$MIRROR} $CODENAME local" \
 	  >> $APTTMP/$CODENAME-$ARCH/apt/sources.list
 	fi
 fi
diff --git a/tools/scanpackages b/tools/scanpackages
index fb9c2a72..0dde6070 100755
--- a/tools/scanpackages
+++ b/tools/scanpackages
@@ -87,8 +87,8 @@ if [ -n "$NONUS" -a "$CODENAME" = "slink" ]; then
 fi
 
 if [ -n "$LOCAL" ]; then
-	if [ -e ${LOCALDEBS:-MIRROR}/dists/$CODNAME/local/binary-$ARCH/Release ]; then
-	   cp ${LOCALDEBS:-MIRROR}/dists/$CODENAME/local/binary-$ARCH/Release \
+	if [ -e ${LOCALDEBS:-$MIRROR}/dists/$CODENAME/local/binary-$ARCH/Release ]; then
+	   cp ${LOCALDEBS:-$MIRROR}/dists/$CODENAME/local/binary-$ARCH/Release \
    		dists/$CODENAME/local/binary-$ARCH/
 	fi
 	grep -v ^X-Medium $PREFIX.Packages-local \