diff --git a/CONF.sh b/CONF.sh
index d4c4f664..24a1ec41 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -43,6 +43,8 @@ unset BASE_INCLUDE      || true
 unset BASE_EXCLUDE      || true
 unset INSTALLER_CD      || true
 unset MAXCDS            || true
+unset MAXISOS           || true
+unset MAXJIGDOS         || true
 unset SPLASHPNG         || true
 unset OMIT_MANUAL	 || true
 unset OMIT_RELEASE_NOTES || true
@@ -203,14 +205,12 @@ export NORECOMMENDS=1
 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"
-fi
-if [ "$MAXJIGDOS"x = ""x ] ; then
-	export MAXJIGDOS="ALL"
-fi
+# produced in your set. If not set or when the value is "ALL" they will
+# be created for all images. One of the variables can be set to zero if
+# either iso or jigdo files are not wanted, but not both.
+# Replaces the old "DOJIGDO" setting with something much more flexible.
+#export MAXISOS=0
+#export MAXJIGDOS=0
 
 # HTTP/FTP URL for directory where you intend to make the templates
 # available. You should not need to change this; the default value ""
diff --git a/build.sh b/build.sh
index 93804335..95829b27 100755
--- a/build.sh
+++ b/build.sh
@@ -56,15 +56,28 @@ if [ -z "$IMAGETARGET" ] ; then
 fi
 echo " ... building the images; using target(s) \"$IMAGETARGET\""
 
-NUMISOS="up to $MAXISOS"
-if [ "$MAXISOS"x = "all"x ] || [ "$MAXISOS"x = "ALL"x ] ; then
+if [ "$MAXISOS"x = ""x ] ; then
+    export MAXISOS="ALL"
+fi
+if [ "$MAXJIGDOS"x = ""x ] ; then
+    export MAXJIGDOS="ALL"
+fi
+
+if [ "$MAXISOS" = "all" ] || [ "$MAXISOS" = "ALL" ] ; then
     NUMISOS="all available"
+elif [ "$MAXISOS" -eq 0 ] ; then
+    NUMISOS="no"
+else
+    NUMISOS="up to $MAXISOS"
 fi
-NUMJIGDOS="up to $MAXJIGDOS"
-if [ "$MAXJIGDOS"x = "all"x ] || [ "$MAXJIGDOS"x = "ALL"x ] ; then
+if [ "$MAXJIGDOS" = "all" ] || [ "$MAXJIGDOS" = "ALL" ] ; then
     NUMJIGDOS="all available"
+elif [ "$MAXJIGDOS" -eq 0 ] ; then
+    NUMJIGDOS="no"
+else
+    NUMJIGDOS="up to $MAXJIGDOS"
 fi
-echo "Building $NUMJIGDOS jigdos and $NUMISOS isos for $ARCH $DISKTYPE"
+echo "Building $NUMJIGDOS jigdos and $NUMISOS isos for $ARCHES $DISKTYPE"
 
 make $IMAGETARGET
 
diff --git a/debian/CONF.sh b/debian/CONF.sh
index d4c4f664..24a1ec41 100644
--- a/debian/CONF.sh
+++ b/debian/CONF.sh
@@ -43,6 +43,8 @@ unset BASE_INCLUDE      || true
 unset BASE_EXCLUDE      || true
 unset INSTALLER_CD      || true
 unset MAXCDS            || true
+unset MAXISOS           || true
+unset MAXJIGDOS         || true
 unset SPLASHPNG         || true
 unset OMIT_MANUAL	 || true
 unset OMIT_RELEASE_NOTES || true
@@ -203,14 +205,12 @@ export NORECOMMENDS=1
 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"
-fi
-if [ "$MAXJIGDOS"x = ""x ] ; then
-	export MAXJIGDOS="ALL"
-fi
+# produced in your set. If not set or when the value is "ALL" they will
+# be created for all images. One of the variables can be set to zero if
+# either iso or jigdo files are not wanted, but not both.
+# Replaces the old "DOJIGDO" setting with something much more flexible.
+#export MAXISOS=0
+#export MAXJIGDOS=0
 
 # HTTP/FTP URL for directory where you intend to make the templates
 # available. You should not need to change this; the default value ""
diff --git a/tools/make_image b/tools/make_image
index 5e3661b2..85732c72 100755
--- a/tools/make_image
+++ b/tools/make_image
@@ -70,12 +70,12 @@ do
 	date
 
     # Work out whether we want ISO, jigdo or both
-    if [ "$MAXISOS" = "all" ] || [ "$MAXISOS" = "ALL" ] || [ "$n" -le "$MAXISOS" ] ; then
+    if [ "$MAXISOS"x = ""x ] || [ "$MAXISOS" = "all" ] || [ "$MAXISOS" = "ALL" ] || [ "$n" -le "$MAXISOS" ] ; then
         ISO_WANTED=1
     else
         ISO_WANTED=0
     fi
-    if [ "$MAXJIGDOS" = "all" ] || [ "$MAXJIGDOS" = "ALL" ] || [ "$n" -le "$MAXJIGDOS" ] ; then
+    if [ "$MAXJIGDOS"x = ""x ] || [ "$MAXJIGDOS" = "all" ] || [ "$MAXJIGDOS" = "ALL" ] || [ "$n" -le "$MAXJIGDOS" ] ; then
         JIGDO_WANTED=1
     else
         JIGDO_WANTED=0