diff --git a/debian/changelog b/debian/changelog
index 449cb563..b7cb1fe0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -38,6 +38,7 @@ debian-cd (3.1.0) UNRELEASED; urgency=low
   * Update the contrib/testingcds script based on its current version on
     farbror.
   * Clean up and update interesting-fromcd23 and exclude task files for lenny.
+  * Fix error in expansion of %ARCH% variables in D-I image location envvars.
 
  -- Frans Pop <fjp@debian.org>  Thu, 13 Nov 2008 22:17:21 +0100
 
diff --git a/tools/boot/lenny/common.sh b/tools/boot/lenny/common.sh
index 289d84c5..b8a055a2 100644
--- a/tools/boot/lenny/common.sh
+++ b/tools/boot/lenny/common.sh
@@ -3,8 +3,8 @@
 
 
 # Expand %ARCH% variable in envvars for location of D-I images
-DI_WWW_HOME="$(echo "$DI_WWW_HOME" | sed -e 's|%ARCH%|$ARCH|g')"
-DI_DIR="$(echo "$DI_DIR" | sed -e 's|%ARCH%|$ARCH|g')"
+DI_WWW_HOME="$(echo "$DI_WWW_HOME" | sed -e "s|%ARCH%|$ARCH|g")"
+DI_DIR="$(echo "$DI_DIR" | sed -e "s|%ARCH%|$ARCH|g")"
 
 
 # install_languages decompacts the language packs, you should give the path