diff --git a/Makefile b/Makefile
index f8b6b032..10edd62c 100755
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,8 @@
 # file in your shell
 
 
+BUILD_DATE=$(shell date -u +%Y%m%d-%H:%M)
+
 ## DEFAULT VALUES
 ifndef VERBOSE_MAKE
 Q=@
@@ -24,10 +26,10 @@ ifndef CAPCODENAME
 CAPCODENAME:=$(shell perl -e "print ucfirst("$(CODENAME)")")
 endif
 ifndef BINDISKINFO
-export BINDISKINFO="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(ARCH) Binary-$$num ($$DATE)"
+export BINDISKINFO="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) $(ARCH) Binary-$$num ($$BUILD_DATE)"
 endif
 ifndef SRCDISKINFO
-export SRCDISKINFO="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) Source-$$num ($$DATE)"
+export SRCDISKINFO="Debian GNU/Linux $(DEBVERSION) \"$(CAPCODENAME)\" - $(OFFICIAL) Source-$$num ($$BUILD_DATE)"
 endif
 # ND=No-Date versions for README
 ifndef BINDISKINFOND
@@ -134,7 +136,6 @@ PATH:=$(PATH):/usr/sbin
 
 PrintVars:
 	@num=1; \
-	DATE=`date +%Y%m%d` ; \
 	echo BINDISKINFO: ; \
         echo $(BINDISKINFO) ; \
 	echo SRCDISKINFO: ; \
diff --git a/debian/changelog b/debian/changelog
index 3b10559d..6b089eac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -65,6 +65,8 @@ debian-cd (2.2.26) UNRELEASED; urgency=low
   * Split final md5sum of images out from Makefile into tools/imagesums;
     if we've made jigdo files then *don't* waste time running md5sum on
     the images as well!
+  * Add the build date/time into a few more places so people can see them
+    more easily; add the build time into the .disk/info file.
 
  -- Frans Pop <fjp@debian.org>  Thu, 23 Nov 2006 01:42:00 +0100
 
diff --git a/tools/boot/etch/boot-amd64 b/tools/boot/etch/boot-amd64
index 9db38961..ceb0379d 100755
--- a/tools/boot/etch/boot-amd64
+++ b/tools/boot/etch/boot-amd64
@@ -135,6 +135,8 @@ if [ -n "$ISOLINUX_DEFAULT" ]; then
     sed -i "s/^DEFAULT .*$/DEFAULT $ISOLINUX_DEFAULT/" boot$N/isolinux/isolinux.cfg
 fi
 
+sed -i "s|built on|built on $BUILD_DATE using d-i|" boot$N/isolinux/f1.txt
+
 # Add autorun if we have README.html
 
 if [ -f $CDDIR/README.html ]; then
diff --git a/tools/boot/etch/boot-i386 b/tools/boot/etch/boot-i386
index d0987457..04f569ab 100755
--- a/tools/boot/etch/boot-i386
+++ b/tools/boot/etch/boot-i386
@@ -198,6 +198,8 @@ if [ "$NN" = "1" ]; then
     fi
 fi
 
+sed -i "s|built on|built on $BUILD_DATE using d-i|" boot$N/isolinux/f1.txt
+
 # Add autorun if we have README.html
 
 if [ -f $CDDIR/README.html ]; then
diff --git a/tools/boot/etch/boot-powerpc b/tools/boot/etch/boot-powerpc
index ae8be6e8..bf115242 100755
--- a/tools/boot/etch/boot-powerpc
+++ b/tools/boot/etch/boot-powerpc
@@ -77,7 +77,6 @@ fi
 #
 # generate/download images for "powerpc"
 # (missing: bootvars1.3b.sit.hqx, BootX_1.2.2.sit, boot-floppy-hfs.img)
-BUILD_DATE=$(date +%Y%m%d)
 cat $BASEDIR/data/$DI_CODENAME/yaboot/boot.msg \
  | sed "s/\${MEDIA_TYPE}/CDROM/" \
  | sed "s/\${DEBIAN_VERSION}/${CODENAME}/g" \
@@ -111,7 +110,6 @@ if [ -f powerpc/vmlinuz-prep.initrd ]; then
 fi
 
 # Copy pegasos forth script, since pegasos machines don't support yaboot yet.
-BUILD_DATE=$(date +%Y%m%d)
 cat $BASEDIR/data/$DI_CODENAME/pegasos/pegasos \
  | sed "s/\${MEDIA_TYPE}/CDROM/" \
  | sed "s/\${DEBIAN_VERSION}/${CODENAME}/g" \
diff --git a/tools/boot/etch/boot-sparc b/tools/boot/etch/boot-sparc
index f1a2df9f..9f27a97e 100755
--- a/tools/boot/etch/boot-sparc
+++ b/tools/boot/etch/boot-sparc
@@ -46,7 +46,6 @@ silo_deb=$MIRROR/`zcat $MIRROR/dists/$DI_CODENAME/main/binary-sparc/Packages.gz
 
 # Some custom etc files
 cp -f -p $BASEDIR/data/etch/sparc/silo.conf $inst/boot/
-BUILD_DATE=$(date +%Y%m%d)
 cat $BASEDIR/data/etch/sparc/debian.txt \
  | sed "s/\${MEDIA_TYPE}/CDROM/" \
  | sed "s/\${DEBIAN_VERSION}/${CODENAME}/g" \