diff --git a/CONF.sh b/CONF.sh
index f81169bb..d4c4f664 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -29,6 +29,7 @@ unset ISOLINUX          || true
 unset EXCLUDE           || true
 unset NORECOMMENDS      || true
 unset NOSUGGESTS        || true
+unset IMAGESUMS         || true
 unset JIGDOTEMPLATEURL  || true
 unset JIGDOFALLBACKURLS || true
 unset JIGDOINCLUDEURLS  || true
@@ -198,14 +199,17 @@ export NORECOMMENDS=1
 # package on the CD.  The default is 'true'.
 #export NOSUGGESTS=1
 
+# Set to 1 to generate MD5 and SHA1 sums for generated images
+export IMAGESUMS=1
+
 # Produce iso/jigdo files: specify how many iso/jigdo files should be
 # produced in your set, or "ALL". Replaces the old "DOJIGDO" setting
 # with something much more flexible
 if [ "$MAXISOS"x = ""x ] ; then
-    export MAXISOS="ALL"
+	export MAXISOS="ALL"
 fi
 if [ "$MAXJIGDOS"x = ""x ] ; then
-    export MAXJIGDOS="ALL"
+	export MAXJIGDOS="ALL"
 fi
 
 # HTTP/FTP URL for directory where you intend to make the templates
diff --git a/build.sh b/build.sh
index 3fcb6172..93804335 100755
--- a/build.sh
+++ b/build.sh
@@ -68,4 +68,6 @@ echo "Building $NUMJIGDOS jigdos and $NUMISOS isos for $ARCH $DISKTYPE"
 
 make $IMAGETARGET
 
-make imagesums
+if [ "$IMAGESUMS"x = 1x ]; then
+	make imagesums
+fi
diff --git a/build_all.sh b/build_all.sh
index 36581430..ba378e4f 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -62,7 +62,9 @@ do
 	echo " ... building the images; using target(s) \"$IMAGETARGET\""
 	make $IMAGETARGET
 
-	make imagesums
+	if [ "$IMAGESUMS"x = 1x ]; then
+		make imagesums
+	fi
 
 	echo "--------------- `date` ---------------"
 done
diff --git a/debian/CONF.sh b/debian/CONF.sh
index f81169bb..d4c4f664 100644
--- a/debian/CONF.sh
+++ b/debian/CONF.sh
@@ -29,6 +29,7 @@ unset ISOLINUX          || true
 unset EXCLUDE           || true
 unset NORECOMMENDS      || true
 unset NOSUGGESTS        || true
+unset IMAGESUMS         || true
 unset JIGDOTEMPLATEURL  || true
 unset JIGDOFALLBACKURLS || true
 unset JIGDOINCLUDEURLS  || true
@@ -198,14 +199,17 @@ export NORECOMMENDS=1
 # package on the CD.  The default is 'true'.
 #export NOSUGGESTS=1
 
+# Set to 1 to generate MD5 and SHA1 sums for generated images
+export IMAGESUMS=1
+
 # Produce iso/jigdo files: specify how many iso/jigdo files should be
 # produced in your set, or "ALL". Replaces the old "DOJIGDO" setting
 # with something much more flexible
 if [ "$MAXISOS"x = ""x ] ; then
-    export MAXISOS="ALL"
+	export MAXISOS="ALL"
 fi
 if [ "$MAXJIGDOS"x = ""x ] ; then
-    export MAXJIGDOS="ALL"
+	export MAXJIGDOS="ALL"
 fi
 
 # HTTP/FTP URL for directory where you intend to make the templates
diff --git a/debian/changelog b/debian/changelog
index ff3a62d3..639b8298 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -109,7 +109,10 @@ debian-cd (3.0.5) UNRELEASED; urgency=low
       shell script (tools/which_deb), called from Makefile and boot-* as
       needed.
 
- -- Frans Pop <fjp@debian.org>  Mon, 04 Aug 2008 18:59:31 +0200
+  [ Frans Pop ]
+  * Allow to skip generating MD5 and SHA1 sums files.
+
+ -- Frans Pop <fjp@debian.org>  Sat, 20 Sep 2008 21:36:11 +0200
 
 debian-cd (3.0.4) unstable; urgency=low