diff --git a/debian/changelog b/debian/changelog
index 338c2ec6..3588fd3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,8 +20,12 @@ debian-cd (2.2.22) UNRELEASED; urgency=low
     - Don't copy the whole d-i cdrom directory onto CD1 for amd64.
       Closes: #306926
     - Don't copy boot.img.gz onto amd64 CD1.
+  * Santiago Garcia
+    - Allow the usage of a local mirror of the daily d-i builds to be used
+      for sid_d-i builds, this is done by setting DI_WWW_HOME=default and
+      DI_DIR=/path/to/the/mirror
 
- -- Joey Hess <joeyh@debian.org>  Thu, 14 Apr 2005 00:59:49 -0400
+-- Joey Hess <joeyh@debian.org>  Thu, 14 Apr 2005 00:59:49 -0400
 
 debian-cd (2.2.21) unstable; urgency=low
 
diff --git a/tools/boot/sarge/boot-alpha b/tools/boot/sarge/boot-alpha
index 7550ec20..d0c723f4 100755
--- a/tools/boot/sarge/boot-alpha
+++ b/tools/boot/sarge/boot-alpha
@@ -27,6 +27,10 @@ CDDIR=$2
 BOOTDIR=
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~vorlon/d-i/alpha/daily/cdrom/"
+   if [ -n "$DI_DIR" ];then
+      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+      DI_WWW_HOME=""                     
+   fi
 fi
 if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
@@ -56,7 +60,10 @@ ar p $ab_deb data.tar.gz | tar zxf - -C boot$N/ ./boot/bootlx
 for image in initrd.gz vmlinuz; do
     if [ ! -e "$image" ]; then
 	if [ ! "$DI_WWW_HOME" ];then
-		cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/$image" .
+		if [ ! "$DI_DIR" ];then
+		   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom"
+		fi
+		cp "$DI_DIR/$image" .
 	else
 	# XXX: not really 'daily'...
 		wget "$DI_WWW_HOME/$image"
diff --git a/tools/boot/sarge/boot-arm b/tools/boot/sarge/boot-arm
index bd7a07a8..289af22e 100755
--- a/tools/boot/sarge/boot-arm
+++ b/tools/boot/sarge/boot-arm
@@ -20,6 +20,10 @@ CDDIR=$2
 INSTALLDIR=$CDDIR/install
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~kmuto/d-i/images/daily"
+   if [ -n "$DI_DIR" ];then
+      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+      DI_WWW_HOME=""                     
+   fi
 fi
 if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
@@ -38,13 +42,16 @@ cd $INSTALLDIR
 
 for subarch in bast netwinder riscpc riscstation; do
 	if [ ! "$DI_WWW_HOME" ];then
-		DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$subarch/cdrom"
+		if [ ! "$DI_DIR" ];then
+		   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+		fi
+		DI_DIR2="$DI_DIR/$subarch/cdrom"
 	else
-		DI_DIR="di_stuff"
-		wget -r -nd --no-parent --level=1 -P "$DI_DIR" "$DI_WWW_HOME/$subarch/cdrom/"
-		rm -f "$DI_DIR"/index*
+		DI_DIR2="di_stuff"
+		wget -r -nd --no-parent --level=1 -P "$DI_DIR2" "$DI_WWW_HOME/$subarch/cdrom/"
+		rm -f "$DI_DIR2"/index*
 	fi
-	cp -a "$DI_DIR" "$subarch"
+	cp -a "$DI_DIR2" "$subarch"
 	rm -rf di_stuff
 done
 
diff --git a/tools/boot/sarge/boot-hppa b/tools/boot/sarge/boot-hppa
index 6fcfb2bb..a7983da6 100755
--- a/tools/boot/sarge/boot-hppa
+++ b/tools/boot/sarge/boot-hppa
@@ -15,6 +15,10 @@ N=$1
 CDROOT=$2
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~jbailey/d-i/hppa/daily/cdrom/2.6"
+   if [ -n "$DI_DIR" ];then
+      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+      DI_WWW_HOME=""                     
+   fi
 fi
 if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
@@ -33,7 +37,9 @@ ar p "${MIRROR}/${PALODEB}" data.tar.gz | tar xz ./usr/share/palo/iplboot
 mv usr/share/palo/iplboot $CDROOT/install/iplboot
 
 if [ ! "$DI_WWW_HOME" ];then
-	DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/2.6"
+        if [ ! "$DI_DIR" ];then
+           DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/2.6"
+        fi
 else
 	DI_DIR="di_stuff"
 	mkdir "$DI_DIR"
diff --git a/tools/boot/sarge/boot-i386 b/tools/boot/sarge/boot-i386
index 4a7c04ea..a874bf67 100755
--- a/tools/boot/sarge/boot-i386
+++ b/tools/boot/sarge/boot-i386
@@ -15,6 +15,10 @@ CDDIR=$2
 BOOTDIR=
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~joeyh/d-i/images/daily"
+   if [ -n "$DI_DIR" ];then
+      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+      DI_WWW_HOME=""                     
+   fi
 fi
 if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
@@ -62,7 +66,10 @@ for image in $BOOT_IMAGES $DISK_IMAGES; do
 	if [ -n "$LOCAL"  -a -f "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" ]; then
 		cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" "$image"
 	elif [ ! "$DI_WWW_HOME" ];then
-		cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$image" "$image"
+		if [ ! "$DI_DIR" ];then
+		   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+		fi
+		cp "$DI_DIR/$image" "$image"
 	else
 		wget "$DI_WWW_HOME/$image" -O "$image"
 	fi
@@ -77,7 +84,10 @@ for image in $EXTRA_DISK_IMAGES; do
 	if [ -n "$LOCAL"  -a -f "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" ]; then
 		cp "${LOCALDEBS:-$MIRROR}/dists/$DI_DIST/local/installer-$ARCH/current/images/$image" "$image"
 	elif [ ! "$DI_WWW_HOME" ];then
-		cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$image" "$image" || true
+		if [ ! "$DI_DIR" ];then
+		   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+		fi
+		cp "$DI_DIR/$image" "$image" || true
 	else
 		wget "$DI_WWW_HOME/$image" -O "$image" || rm -f "$image"
 	fi
@@ -189,7 +199,10 @@ if [ "$NN" = "1" ]; then
 				dir=$(dirname $image)
 				mkdir -p $dir
 				if [ ! "$DI_WWW_HOME" ];then
-					cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$image" "$image"
+					if [ ! "$DI_DIR" ];then
+					   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+					fi
+					cp "$DI_DIR/$image" "$image"
 				else
 					wget "$DI_WWW_HOME/$image" -O "$image"
 				fi
diff --git a/tools/boot/sarge/boot-ia64 b/tools/boot/sarge/boot-ia64
index 16eb2bca..620a4d0a 100755
--- a/tools/boot/sarge/boot-ia64
+++ b/tools/boot/sarge/boot-ia64
@@ -15,6 +15,10 @@ CDDIR=$2
 BOOTDIR=
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~jbailey/d-i/ia64/daily"
+   if [ -n "$DI_DIR" ];then
+      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+      DI_WWW_HOME=""                     
+   fi
 fi
 if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
@@ -32,8 +36,11 @@ fi
 for image in boot.img; do
     if [ ! -e "$image" ]; then
 	if [ ! "$DI_WWW_HOME" ];then
-		cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/$image" . || \
-		cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$image" .
+        	if [ ! "$DI_DIR" ];then
+		   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+		fi
+		cp "$DI_DIR/cdrom/$image" . || \
+		cp "$DI_DIR/$image" .
 	else
 		wget "$DI_WWW_HOME/cdrom/$image" || \
 		wget "$DI_WWW_HOME/$image"
diff --git a/tools/boot/sarge/boot-m68k b/tools/boot/sarge/boot-m68k
index 8fcce448..dad0f150 100755
--- a/tools/boot/sarge/boot-m68k
+++ b/tools/boot/sarge/boot-m68k
@@ -14,12 +14,12 @@ N=$1
 CDDIR=$2
 INSTALLDIR=$CDDIR/install
 
-# the ! case further down doesn't seem to work.
-#if [ ! "$DI_WWW_HOME" ];then
-#	DI_WWW_HOME="default" 
-#fi
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~smarenka/d-i/images-m68k/daily/"
+   if [ -n "$DI_DIR" ];then
+      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+      DI_WWW_HOME=""                     
+   fi
 elif [ "$DI_WWW_HOME" = "test" ];then
    DI_WWW_HOME="http://people.debian.org/~smarenka/d-i/test/cd/"
 fi
@@ -27,7 +27,6 @@ if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
 fi
 
-DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
 DI_BOOTLOADER="http://people.debian.org/~smarenka/d-i"
 
 cd $CDDIR/..
@@ -57,41 +56,11 @@ cd $INSTALLDIR
 
 if [ ! "$DI_WWW_HOME" ];then
 	if [ ! $DI_DIR ]; then
-		echo "Rats, can't find: $DI_DIR!"
+		DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
 	fi
 	cp -a $DI_DIR/* .
-
-#	SUBARCHS=`find "$DI_DIR/*" -type d -print | sed -e 's,.*/,,'`
-#	for subarch in $SUBARCHS; do
-#		echo "subarch: $subarch"
-#		mkdir $subarch
-#		cp -a "$DI_DIR"/$subarch/* $subarch
-#	done
-#	cp "$DI_DIR/cdrom-initrd.gz" root.bin
-#	if [ -f "$DI_DIR/cdrom22-initrd.gz" ]; then 
-#		cp "$DI_DIR/cdrom22-initrd.gz" root22.bin
-#	fi
-#	cp "$DI_DIR/MANIFEST" .
 else
 	wget -q -np -nH --cut-dirs=4 -r -l 3 -R '.gif,.log,stats.txt,index*' "$DI_WWW_HOME"
-
-#	SUBARCHS=$(wget -q "$DI_WWW_HOME/" -O - | \
-#		sed -n -e 's/.*>\(.*\)\/<.*/\1/p')
-
-#	for subarch in $SUBARCHS; do
-#		echo "subarch: $subarch"
-#		mkdir $subarch
-#		cd $subarch
-#		wget -q -np -nd -r -l 1 -R '.gif' "$DI_WWW_HOME/$subarch"
-#		rm index*
-#		cd ..
-#	done
-#	wget -O root.bin "$DI_WWW_HOME/cdrom-initrd.gz"
-#	if ! wget -O root22.bin "$DI_WWW_HOME/cdrom22-initrd.gz" ; then
-#		rm root22.bin
-#	fi
-#	wget -O MANIFEST "$DI_WWW_HOME/MANIFEST"
-
 fi
 
 SUBARCHS=`grep vmlinu MANIFEST | cut -d'-' -f3 | sort -u | awk '{printf "%s ", $1}'`
diff --git a/tools/boot/sarge/boot-mips b/tools/boot/sarge/boot-mips
index 902834ba..9a4cf557 100755
--- a/tools/boot/sarge/boot-mips
+++ b/tools/boot/sarge/boot-mips
@@ -15,6 +15,10 @@ N=$1
 CDROOT=$2
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~ths/d-i/images/daily/"
+   if [ -n "$DI_DIR" ];then
+      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+      DI_WWW_HOME=""                     
+   fi
 fi
 if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
@@ -28,7 +32,9 @@ if [ $N != 1 -a $N != 1_NONUS ]; then
 fi
 
 if [ ! "$DI_WWW_HOME" ];then
-	DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+        if [ ! "$DI_DIR" ];then
+           DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+        fi
 else
 	DI_DIR="di_stuff"
 	wget -P "$DI_DIR/r4k-ip22" "$DI_WWW_HOME/r4k-ip22/cdrom-boot.img"
diff --git a/tools/boot/sarge/boot-mipsel b/tools/boot/sarge/boot-mipsel
index 4d869327..68081a5c 100755
--- a/tools/boot/sarge/boot-mipsel
+++ b/tools/boot/sarge/boot-mipsel
@@ -23,6 +23,10 @@ N=$1
 CDROOT=$2
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~tbm/d-i/images/mipsel/daily/"
+   if [ -n "$DI_DIR" ];then
+      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+      DI_WWW_HOME=""                     
+   fi
 fi
 if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
@@ -46,7 +50,9 @@ install -m 644 -D $BASEDIR/data/sarge/delo.conf "$CDROOT"/etc/delo.conf
 install -m 644 -D "$DELOROOT"/boot/delo.2nd "$CDROOT"/boot/delo.2nd
 
 if [ ! "$DI_WWW_HOME" ];then
-	DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/"
+	if [ ! "$DI_DIR" ];then
+	   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/"
+	fi
 else
         DI_DIR="."
         wget "$DI_WWW_HOME" -O di.dir
diff --git a/tools/boot/sarge/boot-powerpc b/tools/boot/sarge/boot-powerpc
index 86d3b24a..a03dc90b 100755
--- a/tools/boot/sarge/boot-powerpc
+++ b/tools/boot/sarge/boot-powerpc
@@ -15,6 +15,10 @@ CDDIR=$2
 INSTALLDIR=$CDDIR/install
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~luther/d-i/images/daily"
+   if [ -n "$DI_DIR" ];then
+      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+      DI_WWW_HOME=""
+   fi
 fi
 if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
@@ -87,9 +91,12 @@ cp $BASEDIR/data/sarge/yaboot/ofboot.b ofboot.b
 for subarch in powerpc power3 power4
 do
   if [ ! "$DI_WWW_HOME" ];then
-  	cp -a "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$subarch/cdrom" "$subarch"
+        if [ ! "$DI_DIR" ];then 
+           DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+        fi
+  	cp -a "$DI_DIR/$subarch/cdrom" "$subarch"
 	if [ "$subarch" = "powerpc" ]; then
-		cp -a "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$subarch/cdrom-minimal" "$subarch/minimal" || true
+		cp -a "$DI_DIR/$subarch/cdrom-minimal" "$subarch/minimal" || true
 	else
 		# Supported for netboot only on POWER3 and POWER4.
 		rm -rf "$subarch/2.4"
diff --git a/tools/boot/sarge/boot-sparc b/tools/boot/sarge/boot-sparc
index bf032384..8d84695b 100755
--- a/tools/boot/sarge/boot-sparc
+++ b/tools/boot/sarge/boot-sparc
@@ -12,6 +12,10 @@ N=$1
 CDDIR=$2
 if [ "$DI_WWW_HOME" = "default" ];then
    DI_WWW_HOME="http://people.debian.org/~stappers/d-i/images/daily/cdrom"
+   if [ -n "$DI_DIR" ];then
+      DI_DIR="$DI_DIR/~${DI_WWW_HOME#*~}"
+      DI_WWW_HOME=""                     
+   fi
 fi
 if [ ! "$DI_DIST" ]; then
    DI_DIST="$DI_CODENAME"
@@ -52,7 +56,9 @@ cat $BASEDIR/data/sarge/sparc/debian.txt \
 # uncompress it before hand.
 
 if [ ! "$DI_WWW_HOME" ];then
-	DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom"
+	if [ ! "$DI_DIR" ];then
+	   DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom"
+	fi
 else
 	DI_DIR="."
 	wget "$DI_WWW_HOME" -O di.dir