diff --git a/Makefile b/Makefile
index c84a1ab0..8db5b6fb 100755
--- a/Makefile
+++ b/Makefile
@@ -875,10 +875,10 @@ images: bin-images src-images
 #    2    jigdo, cleanup_jigdo
 #
 bin-images: ok bin-md5list $(OUT)
-	$(make_image) $(BDIR) $(ARCH) $(OUT) $(DOJIGDO) $(DEBVERSION) $(MIRROR) $(MKISOFS) $(MKISOFS_OPTS) $(JIGDO_OPTS) $(JIGDO_CLEANUP)
+	$(make_image) "$(BDIR)" "$(ARCH)" "$(OUT)" "$(DOJIGDO)" "$(DEBVERSION)" "$(MIRROR)" "$(MKISOFS)" "$(MKISOFS_OPTS)" "$(JIGDO_OPTS)" "$(jigdo_cleanup)"
 
 src-images: ok src-md5list $(OUT)
-	$(make_image) $(SDIR) source $(OUT) $(DOJIGDO) $(DEBVERSION) $(MIRROR) $(MKISOFS) $(MKISOFS_OPTS) $(JIGDO_OPTS) $(JIGDO_CLEANUP)
+	$(make_image) "$(SDIR)" source "$(OUT)" "$(DOJIGDO)" "$(DEBVERSION)" "$(MIRROR)" "$(MKISOFS)" "$(MKISOFS_OPTS)" "$(JIGDO_OPTS)" "$(jigdo_cleanup)"
 
 check-number-given:
 	@test -n "$(CD)" || (echo "Give me a CD=<num> parameter !" && false)
diff --git a/tools/make_image b/tools/make_image
index 4e9a2b3d..d4add6ea 100755
--- a/tools/make_image
+++ b/tools/make_image
@@ -15,7 +15,8 @@ MIRROR=$6
 MKISOFS=$7
 MKISOFS_OPTS=$8
 JIGDO_OPTS=$9
-JIGDO_CLEANUP=$10
+shift
+JIGDO_CLEANUP=$9
 
 if [ "$CD"x = ""x ] ; then
 	echo "Generating the $ARCH iso/jigdo images ..."
@@ -69,7 +70,7 @@ do
 
 		2) # jigdo only, no ISO
 			$MKISOFS $MKISOFS_OPTS -V "$volid" \
-				-o /dev/null -v \
+				-o /dev/null \
 				-jigdo-jigdo $OUT/$OUTFILE.jigdo \
 				-jigdo-template $OUT/$OUTFILE.template \
 				-jigdo-map Debian=$MIRROR/ \