diff --git a/Makefile b/Makefile
index 7b7eda3d..8afbc680 100755
--- a/Makefile
+++ b/Makefile
@@ -148,6 +148,7 @@ endif
 endif
 $(BDIR)/DATE:
 	$(Q)date '+%Y%m%d' > $(BDIR)/DATE
+	$(Q)date '+%Y%m%dT%H%M%SZ' > $(BDIR)/DATE-zulu
 
 ifdef MIRROR
 LATEST_DB := $(MIRROR)/$(shell $(which_deb) $(MIRROR) $(CODENAME) debootstrap)
diff --git a/debian/changelog b/debian/changelog
index 15333b0f..8d1192d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,7 @@ debian-cd (3.1.6) UNRELEASED; urgency=low
     tools/generate_firmware_task.
   * Add apt-offline to tasks/wheezy/forcd1 to bring it onto CD#1.
     Closes: #630805
+  * Add links to snapshot.debian.org into jigdo files. 
 
   [ Aurelien Jarno ]
   * Add support for hurd-i386. Closes: #619211
diff --git a/tools/jigdo_cleanup b/tools/jigdo_cleanup
index 551f62e1..e57dab5d 100755
--- a/tools/jigdo_cleanup
+++ b/tools/jigdo_cleanup
@@ -15,6 +15,7 @@ iso="$2"      # The name to give to the .iso
 dirpath="$3"  # The disc build tree
 template="$4" # URL for .template file, can be relative URL
 discinfo="$5" # e.g. "Debian GNU/Linux 3.0 r1 "Woody" - Unofficial i386 Binary-1"
+snapurl="$6"  # URL for snapshot.d.o. e.g. http://snapshot.debian.org/archive/debian/20110630T000000Z/
 # any further parameters are fallback URLs
 info="Generated on "`date -R`
 
@@ -39,6 +40,11 @@ cat $jigdo | awk -v ISO="$iso" -v TEMPLATE="$template" -v DISCINFO="$discinfo" -
 ' > $jigdo.1
 mv -f $jigdo.1 $jigdo
 
+# Snapshot URL
+if [ "$snapurl"x != ""x ] ; then
+    echo "$snapurl" >> $jigdo
+fi
+
 # If some fallbacks were specified, output a servers section with the
 # URLs. The entries of the variable are expected to be already of the
 # form "Label=http://some.url/"
diff --git a/tools/make_image b/tools/make_image
index 8c1828c1..15ac047d 100755
--- a/tools/make_image
+++ b/tools/make_image
@@ -129,10 +129,13 @@ do
 
     # If we've made jigdo files, tweak them with extra info now
     if [ "$JIGDO_WANTED" = 1 ] ; then
+        SNAPSSHOT_DATE=`cat $DIR/DATE-zulu`
+        SNAPSHOTURL="http://snapshot.debian.org/archive/debian/$SNAPSHOT_DATE/"
         $JIGDO_CLEANUP $OUT/$OUTFILE.jigdo \
             $OUTFILE.iso $DIR/CD$n \
             "`echo "$JIGDOTEMPLATEURL" | sed -e 's|%ARCH%|$ARCH|g'`$OUTFILE.template" \
             "$DISKINFO" \
+            $SNAPSHOTURL \
             $JIGDOFALLBACKURLS
         if [ "$ISO_WANTED" = 1 ] ; then
             # Make sure that the ISO is as new/newer than the jigdo file; #587774