diff --git a/debian/changelog b/debian/changelog
index 0cebc690..725b2f97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ debian-cd (3.1.17-jessie) UNRELEASED; urgency=medium
       - Drop the remaining s390 bits from jessie. (s390x remains)
       - Drop the d390oco loader from and jessie
     + include espeakup on cd1, not speakup, and alsa-utils. Closes: #809497
+    + Switch references to d-i.debian.org to use https instead of http.
+      Closes: #809698
 
  -- Steve McIntyre <93sam@debian.org>  Mon, 20 Apr 2015 12:36:57 +0100
 
diff --git a/tools/boot/jessie/boot-alpha b/tools/boot/jessie/boot-alpha
index 8908967c..762ae2eb 100755
--- a/tools/boot/jessie/boot-alpha
+++ b/tools/boot/jessie/boot-alpha
@@ -26,7 +26,7 @@ N=$1
 CDDIR=$2
 BOOTDIR=
 if [ "$DI_WWW_HOME" = "default" ];then
-    DI_WWW_HOME="http://d-i.debian.org/daily-images/alpha/daily/cdrom/"
+    DI_WWW_HOME="https://d-i.debian.org/daily-images/alpha/daily/cdrom/"
     try_di_image_cache
 fi
 
diff --git a/tools/boot/jessie/boot-arm b/tools/boot/jessie/boot-arm
index e502d06d..7d729f61 100755
--- a/tools/boot/jessie/boot-arm
+++ b/tools/boot/jessie/boot-arm
@@ -21,10 +21,10 @@ if [ "$DI_WWW_HOME" = "default" ];then
     # do *not* do that - these defs are parsed out by other scripts that
     # won't cope with that
     if [ "$ARCH" = armel ]; then
-        DI_WWW_HOME="http://d-i.debian.org/daily-images/armel/daily"
+        DI_WWW_HOME="https://d-i.debian.org/daily-images/armel/daily"
 	CUT=3
     elif [ "$ARCH" = armhf ]; then
-        DI_WWW_HOME="http://d-i.debian.org/daily-images/armhf/daily"
+        DI_WWW_HOME="https://d-i.debian.org/daily-images/armhf/daily"
 	CUT=3
     else
         echo "$0: unknown arch $ARCH; abort"
diff --git a/tools/boot/jessie/boot-arm64 b/tools/boot/jessie/boot-arm64
index 5cd35da8..66e2815f 100755
--- a/tools/boot/jessie/boot-arm64
+++ b/tools/boot/jessie/boot-arm64
@@ -18,7 +18,7 @@ CDDIR=$2
 BOOTDIR=
 INSTALLDIR="install.a64"
 if [ "$DI_WWW_HOME" = "default" ];then
-    DI_WWW_HOME="http://d-i.debian.org/daily-images/arm64/daily"
+    DI_WWW_HOME="https://d-i.debian.org/daily-images/arm64/daily"
     try_di_image_cache
 fi
 
diff --git a/tools/boot/jessie/boot-hppa b/tools/boot/jessie/boot-hppa
index 84fa250e..8e66f501 100755
--- a/tools/boot/jessie/boot-hppa
+++ b/tools/boot/jessie/boot-hppa
@@ -14,7 +14,7 @@ set -e
 N=$1
 CDROOT=$2
 if [ "$DI_WWW_HOME" = "default" ];then
-    DI_WWW_HOME="http://d-i.debian.org/daily-images/hppa/daily/cdrom/2.6"
+    DI_WWW_HOME="https://d-i.debian.org/daily-images/hppa/daily/cdrom/2.6"
     try_di_image_cache
 fi
 
diff --git a/tools/boot/jessie/boot-hurd b/tools/boot/jessie/boot-hurd
index 89ef3f68..f64b091d 100644
--- a/tools/boot/jessie/boot-hurd
+++ b/tools/boot/jessie/boot-hurd
@@ -16,7 +16,7 @@ N=$1
 CDDIR=$2
 BOOTDIR=
 if [ "$DI_WWW_HOME" = "default" ];then
-    DI_WWW_HOME="http://d-i.debian.org/daily-images/hurd-i386/daily/"
+    DI_WWW_HOME="https://d-i.debian.org/daily-images/hurd-i386/daily/"
     try_di_image_cache
 fi
 
diff --git a/tools/boot/jessie/boot-ia64 b/tools/boot/jessie/boot-ia64
index 6e094403..24cd5f8c 100755
--- a/tools/boot/jessie/boot-ia64
+++ b/tools/boot/jessie/boot-ia64
@@ -13,7 +13,7 @@ N=$1
 CDDIR=$2
 BOOTDIR=
 if [ "$DI_WWW_HOME" = "default" ];then
-    DI_WWW_HOME="http://d-i.debian.org/daily-images/ia64/daily"
+    DI_WWW_HOME="https://d-i.debian.org/daily-images/ia64/daily"
     try_di_image_cache
 fi
 
diff --git a/tools/boot/jessie/boot-kfreebsd b/tools/boot/jessie/boot-kfreebsd
index ceb437b7..eae3695b 100644
--- a/tools/boot/jessie/boot-kfreebsd
+++ b/tools/boot/jessie/boot-kfreebsd
@@ -20,9 +20,9 @@ if [ "$DI_WWW_HOME" = "default" ];then
     # do *not* do that - these defs are parsed out by other scripts that
     # won't cope with that
     if [ "$ARCH" = kfreebsd-i386 ]; then
-        DI_WWW_HOME="http://d-i.debian.org/daily-images/kfreebsd-i386/daily/"
+        DI_WWW_HOME="https://d-i.debian.org/daily-images/kfreebsd-i386/daily/"
     else
-        DI_WWW_HOME="http://d-i.debian.org/daily-images/kfreebsd-amd64/daily/"
+        DI_WWW_HOME="https://d-i.debian.org/daily-images/kfreebsd-amd64/daily/"
     fi
     try_di_image_cache
 fi
diff --git a/tools/boot/jessie/boot-mips b/tools/boot/jessie/boot-mips
index 82492136..23e68fed 100755
--- a/tools/boot/jessie/boot-mips
+++ b/tools/boot/jessie/boot-mips
@@ -14,7 +14,7 @@ set -e
 N=$1
 CDROOT=$2
 if [ "$DI_WWW_HOME" = "default" ];then
-    DI_WWW_HOME="http://d-i.debian.org/daily-images/mips/daily/"
+    DI_WWW_HOME="https://d-i.debian.org/daily-images/mips/daily/"
     try_di_image_cache
 fi
 
diff --git a/tools/boot/jessie/boot-mipsel b/tools/boot/jessie/boot-mipsel
index dd2e75d5..d89f890b 100755
--- a/tools/boot/jessie/boot-mipsel
+++ b/tools/boot/jessie/boot-mipsel
@@ -16,7 +16,7 @@ set -e
 N=$1
 CDROOT=$2
 if [ "$DI_WWW_HOME" = "default" ];then
-    DI_WWW_HOME="http://d-i.debian.org/daily-images/mipsel/daily"
+    DI_WWW_HOME="https://d-i.debian.org/daily-images/mipsel/daily"
     try_di_image_cache
 fi
 
diff --git a/tools/boot/jessie/boot-powerpc b/tools/boot/jessie/boot-powerpc
index d8b3034f..b4bbba9a 100755
--- a/tools/boot/jessie/boot-powerpc
+++ b/tools/boot/jessie/boot-powerpc
@@ -15,7 +15,7 @@ N=$1
 CDDIR=$2
 INSTALLDIR=$CDDIR/install
 if [ "$DI_WWW_HOME" = "default" ];then
-    DI_WWW_HOME="http://d-i.debian.org/daily-images/powerpc/daily"
+    DI_WWW_HOME="https://d-i.debian.org/daily-images/powerpc/daily"
     try_di_image_cache
 fi
 
diff --git a/tools/boot/jessie/boot-ppc64el b/tools/boot/jessie/boot-ppc64el
index 6f90e451..aa6feda9 100755
--- a/tools/boot/jessie/boot-ppc64el
+++ b/tools/boot/jessie/boot-ppc64el
@@ -25,7 +25,7 @@ N=$1
 CDDIR=$2
 INSTALLDIR=$CDDIR/install
 if [ "$DI_WWW_HOME" = "default" ];then
-    DI_WWW_HOME="http://d-i.debian.org/daily-images/ppc64el/daily"
+    DI_WWW_HOME="https://d-i.debian.org/daily-images/ppc64el/daily"
     try_di_image_cache
 fi
 
diff --git a/tools/boot/jessie/boot-s390x b/tools/boot/jessie/boot-s390x
index c9f73ad3..f9b40dd4 100755
--- a/tools/boot/jessie/boot-s390x
+++ b/tools/boot/jessie/boot-s390x
@@ -36,7 +36,7 @@ if [ "$DI_WWW_HOME" = "default" ];then
     # do *not* do that - these defs are parsed out by other scripts that
     # won't cope with that
     if [ "$ARCH" = s390x ]; then
-        DI_WWW_HOME="http://d-i.debian.org/daily-images/s390x/daily"
+        DI_WWW_HOME="https://d-i.debian.org/daily-images/s390x/daily"
     fi
     try_di_image_cache
 fi
diff --git a/tools/boot/jessie/boot-sparc b/tools/boot/jessie/boot-sparc
index 8f411717..fea5bac4 100755
--- a/tools/boot/jessie/boot-sparc
+++ b/tools/boot/jessie/boot-sparc
@@ -11,7 +11,7 @@ set -e
 N=$1
 CDDIR=$2
 if [ "$DI_WWW_HOME" = "default" ];then
-    DI_WWW_HOME="http://d-i.debian.org/daily-images/sparc/daily/cdrom/"
+    DI_WWW_HOME="https://d-i.debian.org/daily-images/sparc/daily/cdrom/"
     try_di_image_cache
 fi
 
diff --git a/tools/boot/jessie/boot-x86 b/tools/boot/jessie/boot-x86
index b62c52cf..d760106b 100644
--- a/tools/boot/jessie/boot-x86
+++ b/tools/boot/jessie/boot-x86
@@ -40,9 +40,9 @@ if [ "$DI_WWW_HOME" = "default" ];then
     # do *not* do that - these defs are parsed out by other scripts that
     # won't cope with that
     if [ "$ARCH" = i386 ]; then
-        DI_WWW_HOME="http://d-i.debian.org/daily-images/i386/daily"
+        DI_WWW_HOME="https://d-i.debian.org/daily-images/i386/daily"
     else
-        DI_WWW_HOME="http://d-i.debian.org/daily-images/amd64/daily"
+        DI_WWW_HOME="https://d-i.debian.org/daily-images/amd64/daily"
     fi
     try_di_image_cache
 else
diff --git a/tools/boot/wheezy/boot-alpha b/tools/boot/wheezy/boot-alpha
index 74b26502..d077b608 100755
--- a/tools/boot/wheezy/boot-alpha
+++ b/tools/boot/wheezy/boot-alpha
@@ -26,9 +26,9 @@ N=$1
 CDDIR=$2
 BOOTDIR=
 if [ "$DI_WWW_HOME" = "default" ];then
-   DI_WWW_HOME="http://d-i.debian.org/daily-images/alpha/daily/cdrom/"
+   DI_WWW_HOME="https://d-i.debian.org/daily-images/alpha/daily/cdrom/"
    if [ -n "$DI_DIR" ];then
-      DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
+      DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
       DI_WWW_HOME=""                     
    fi
 fi
diff --git a/tools/boot/wheezy/boot-arm b/tools/boot/wheezy/boot-arm
index c735db8a..67fed07d 100755
--- a/tools/boot/wheezy/boot-arm
+++ b/tools/boot/wheezy/boot-arm
@@ -17,12 +17,12 @@ N=$1
 CDDIR=$2
 if [ "$DI_WWW_HOME" = "default" ];then
     if [ "$ARCH" = armel ]; then
-	    DI_WWW_HOME="http://d-i.debian.org/daily-images/armel/daily"
+	    DI_WWW_HOME="https://d-i.debian.org/daily-images/armel/daily"
     else
-	    DI_WWW_HOME="http://d-i.debian.org/daily-images/armhf/daily"
+	    DI_WWW_HOME="https://d-i.debian.org/daily-images/armhf/daily"
     fi
     if [ -n "$DI_DIR" ];then
-        DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
+        DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
         DI_WWW_HOME=""                     
         echo "Using images from $DI_DIR"
     fi
diff --git a/tools/boot/wheezy/boot-hppa b/tools/boot/wheezy/boot-hppa
index 315976d7..a283acd4 100755
--- a/tools/boot/wheezy/boot-hppa
+++ b/tools/boot/wheezy/boot-hppa
@@ -14,9 +14,9 @@ set -e
 N=$1
 CDROOT=$2
 if [ "$DI_WWW_HOME" = "default" ];then
-    DI_WWW_HOME="http://d-i.debian.org/daily-images/hppa/daily/cdrom/2.6"
+    DI_WWW_HOME="https://d-i.debian.org/daily-images/hppa/daily/cdrom/2.6"
     if [ -n "$DI_DIR" ];then
-        DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
+        DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
         DI_WWW_HOME=""                     
     fi
 fi
diff --git a/tools/boot/wheezy/boot-hurd b/tools/boot/wheezy/boot-hurd
index ed99282a..fbb51287 100644
--- a/tools/boot/wheezy/boot-hurd
+++ b/tools/boot/wheezy/boot-hurd
@@ -16,9 +16,9 @@ N=$1
 CDDIR=$2
 BOOTDIR=
 if [ "$DI_WWW_HOME" = "default" ];then
-    DI_WWW_HOME="http://d-i.debian.org/daily-images/hurd-i386/daily/"
+    DI_WWW_HOME="https://d-i.debian.org/daily-images/hurd-i386/daily/"
     if [ -n "$DI_DIR" ];then
-        DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
+        DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
         DI_WWW_HOME=""
         echo "Using images from $DI_DIR"
     fi
diff --git a/tools/boot/wheezy/boot-ia64 b/tools/boot/wheezy/boot-ia64
index bd6a5ec6..204d970d 100755
--- a/tools/boot/wheezy/boot-ia64
+++ b/tools/boot/wheezy/boot-ia64
@@ -13,9 +13,9 @@ N=$1
 CDDIR=$2
 BOOTDIR=
 if [ "$DI_WWW_HOME" = "default" ];then
-   DI_WWW_HOME="http://d-i.debian.org/daily-images/ia64/daily"
+   DI_WWW_HOME="https://d-i.debian.org/daily-images/ia64/daily"
    if [ -n "$DI_DIR" ];then
-      DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
+      DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
       DI_WWW_HOME=""                     
    fi
 fi
diff --git a/tools/boot/wheezy/boot-kfreebsd b/tools/boot/wheezy/boot-kfreebsd
index 99a760f0..ba5a4a85 100644
--- a/tools/boot/wheezy/boot-kfreebsd
+++ b/tools/boot/wheezy/boot-kfreebsd
@@ -17,12 +17,12 @@ CDDIR=$2
 BOOTDIR=
 if [ "$DI_WWW_HOME" = "default" ];then
     if [ "$ARCH" = kfreebsd-i386 ]; then
-        DI_WWW_HOME="http://d-i.debian.org/daily-images/kfreebsd-i386/daily/"
+        DI_WWW_HOME="https://d-i.debian.org/daily-images/kfreebsd-i386/daily/"
     else
-        DI_WWW_HOME="http://d-i.debian.org/daily-images/kfreebsd-amd64/daily/"
+        DI_WWW_HOME="https://d-i.debian.org/daily-images/kfreebsd-amd64/daily/"
     fi
     if [ -n "$DI_DIR" ];then
-        DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
+        DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
         DI_WWW_HOME=""
         echo "Using images from $DI_DIR"
     fi
diff --git a/tools/boot/wheezy/boot-mips b/tools/boot/wheezy/boot-mips
index f8a3de82..a4318c6a 100755
--- a/tools/boot/wheezy/boot-mips
+++ b/tools/boot/wheezy/boot-mips
@@ -14,9 +14,9 @@ set -e
 N=$1
 CDROOT=$2
 if [ "$DI_WWW_HOME" = "default" ];then
-   DI_WWW_HOME="http://d-i.debian.org/daily-images/mips/daily/"
+   DI_WWW_HOME="https://d-i.debian.org/daily-images/mips/daily/"
    if [ -n "$DI_DIR" ];then
-       DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
+       DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
        DI_WWW_HOME=""                     
    fi
 fi
diff --git a/tools/boot/wheezy/boot-mipsel b/tools/boot/wheezy/boot-mipsel
index c63a6b76..9a90c7d3 100755
--- a/tools/boot/wheezy/boot-mipsel
+++ b/tools/boot/wheezy/boot-mipsel
@@ -16,9 +16,9 @@ set -e
 N=$1
 CDROOT=$2
 if [ "$DI_WWW_HOME" = "default" ];then
-      DI_WWW_HOME="http://d-i.debian.org/daily-images/mipsel/daily"
+      DI_WWW_HOME="https://d-i.debian.org/daily-images/mipsel/daily"
    if [ -n "$DI_DIR" ];then
-       DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
+       DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
        DI_WWW_HOME=""                     
    fi
 fi
diff --git a/tools/boot/wheezy/boot-powerpc b/tools/boot/wheezy/boot-powerpc
index 0da3016b..7eae8c32 100755
--- a/tools/boot/wheezy/boot-powerpc
+++ b/tools/boot/wheezy/boot-powerpc
@@ -15,9 +15,9 @@ N=$1
 CDDIR=$2
 INSTALLDIR=$CDDIR/install
 if [ "$DI_WWW_HOME" = "default" ];then
-   DI_WWW_HOME="http://d-i.debian.org/daily-images/powerpc/daily"
+   DI_WWW_HOME="https://d-i.debian.org/daily-images/powerpc/daily"
    if [ -n "$DI_DIR" ];then
-       DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
+       DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
        DI_WWW_HOME=""
    fi
 fi
diff --git a/tools/boot/wheezy/boot-s390-common b/tools/boot/wheezy/boot-s390-common
index 84c4040c..04122085 100644
--- a/tools/boot/wheezy/boot-s390-common
+++ b/tools/boot/wheezy/boot-s390-common
@@ -36,12 +36,12 @@ if [ "$DI_WWW_HOME" = "default" ];then
     # do *not* do that - these defs are parsed out by other scripts that
     # won't cope with that
 	if [ "$ARCH" = s390 ]; then
-		DI_WWW_HOME="http://d-i.debian.org/daily-images/s390/daily"
+		DI_WWW_HOME="https://d-i.debian.org/daily-images/s390/daily"
 	else
-		DI_WWW_HOME="http://d-i.debian.org/daily-images/s390x/daily"
+		DI_WWW_HOME="https://d-i.debian.org/daily-images/s390x/daily"
 	fi
     if [ -n "$DI_DIR" -a -e "$DI_DIR/~${DI_WWW_HOME#*~}" ] ; then
-        DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
+        DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
 	    DI_WWW_HOME=""
     fi
 fi
diff --git a/tools/boot/wheezy/boot-sparc b/tools/boot/wheezy/boot-sparc
index f15a5016..1078b34b 100755
--- a/tools/boot/wheezy/boot-sparc
+++ b/tools/boot/wheezy/boot-sparc
@@ -11,9 +11,9 @@ set -e
 N=$1
 CDDIR=$2
 if [ "$DI_WWW_HOME" = "default" ];then
-   DI_WWW_HOME="http://d-i.debian.org/daily-images/sparc/daily/cdrom/"
+   DI_WWW_HOME="https://d-i.debian.org/daily-images/sparc/daily/cdrom/"
    if [ -n "$DI_DIR" ];then
-       DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
+       DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
        DI_WWW_HOME=""                     
    fi
 fi
diff --git a/tools/boot/wheezy/boot-x86 b/tools/boot/wheezy/boot-x86
index 70bf93f1..1fb90731 100644
--- a/tools/boot/wheezy/boot-x86
+++ b/tools/boot/wheezy/boot-x86
@@ -21,12 +21,12 @@ if [ "$DI_WWW_HOME" = "default" ];then
     # do *not* do that - these defs are parsed out by other scripts that
     # won't cope with that
 	if [ "$ARCH" = i386 ]; then
-		DI_WWW_HOME="http://d-i.debian.org/daily-images/i386/daily"
+		DI_WWW_HOME="https://d-i.debian.org/daily-images/i386/daily"
 	else
-		DI_WWW_HOME="http://d-i.debian.org/daily-images/amd64/daily"
+		DI_WWW_HOME="https://d-i.debian.org/daily-images/amd64/daily"
 	fi
 	if [ -n "$DI_DIR" ];then
-		DI_DIR="$DI_DIR/${DI_WWW_HOME#*http://}"
+		DI_DIR="$DI_DIR/${DI_WWW_HOME#*https://}"
 		DI_WWW_HOME=""                     
 		echo "Using images from $DI_DIR"
 	fi