diff --git a/debian/changelog b/debian/changelog
index 9321cf7a..e47db2ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.155) UNRELEASED; urgency=low
+
+  * try to hand the exported $NOW over from live-build/auto/config as
+    $BUILDSTAMP so live-build/auto/build can use it to write a stamp file
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 05 Jul 2013 12:29:50 +0200
+
 livecd-rootfs (2.154) saucy; urgency=low
 
   [ Sergio Schvezov ]
diff --git a/live-build/auto/build b/live-build/auto/build
index 9cf3caf3..1a35be61 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -239,7 +239,7 @@ deb file:/var/lib/preinstalled-pool/ $LB_DISTRIBUTION $LB_PARENT_ARCHIVE_AREAS
 		INFO_DESC="$(lsb_release -d -s)"
 
 		mkdir -p chroot/var/log/installer
-		echo "$INFO_DESC - $ARCH ($NOW)" >chroot/var/log/installer/media-info
+		echo "$INFO_DESC - $ARCH ($BUILDSTAMP)" >chroot/var/log/installer/media-info
 	fi
 
 	echo "===== Checking size of /usr/share/doc ====="
diff --git a/live-build/auto/config b/live-build/auto/config
index f8807fa0..0d676af7 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -89,6 +89,8 @@ PREINSTALL_POOL_SEEDS=
 CHROOT_HOOKS=
 BINARY_HOOKS=
 
+BUILDSTAMP="${NOW}"
+
 add_chroot_hook ()
 {
 	CHROOT_HOOKS="${CHROOT_HOOKS:+$CHROOT_HOOKS }$1"