diff --git a/contrib/testingcds b/contrib/testingcds
index 6fdd0a13..bfe4e4b1 100755
--- a/contrib/testingcds
+++ b/contrib/testingcds
@@ -213,7 +213,7 @@ if ./build.sh "$ARCH" >>"$LOGFILE" 2>&1 ; then
             mv $OUT/$BASE.iso $ARCHDIR/iso-cd/$NETINSTNAME.iso
             cat $OUT/$BASE.jigdo | \
                 sed 's/-BC-1/-businesscard/g;s/-NETINST-1/-netinst/g' | \
-                gzip --best --no-name > $ARCHDIR/jigdo-cd/$NETINSTNAME.jigdo
+                pigz -9nm > $ARCHDIR/jigdo-cd/$NETINSTNAME.jigdo
             rm $OUT/$BASE.jigdo
             mv $OUT/$BASE.template $ARCHDIR/jigdo-cd/$NETINSTNAME.template
             # Make sure that the ISO is as new/newer than the jigdo file; #587774
@@ -232,7 +232,7 @@ if ./build.sh "$ARCH" >>"$LOGFILE" 2>&1 ; then
         #######################################
 
         # finish up the jigdos (compress & move them)
-        gzip --best --no-name "$OUT"/*.jigdo
+        pigz -9nm "$OUT"/*.jigdo
         for i in "$OUT"/*.jigdo.gz; do
             mv $i ${i%.gz}
         done
diff --git a/tools/Packages-gen b/tools/Packages-gen
index 189610ac..978bc45a 100755
--- a/tools/Packages-gen
+++ b/tools/Packages-gen
@@ -33,4 +33,4 @@ else
 fi
 [ -d $repo ] || mkdir -p $repo
 echo Creating Packages file for $repo...
-apt-ftparchive packages $repo | gzip >$repo/Packages.gz
+apt-ftparchive packages $repo | pigz -9nm >$repo/Packages.gz
diff --git a/tools/create_control b/tools/create_control
index 5c3fcfaf..1091ef4c 100755
--- a/tools/create_control
+++ b/tools/create_control
@@ -59,7 +59,7 @@ case $ARCH in
 		mkdir -p dists/$CODENAME/$SECT/source
 		dpkg-scansources pool/$SECT > dists/$CODENAME/$SECT/source/Sources
 		if [ -f dists/$CODENAME/$SECT/source/Sources ] ; then
-		    gzip --best dists/$CODENAME/$SECT/source/Sources
+		    pigz -9nm dists/$CODENAME/$SECT/source/Sources
 		fi
 	    fi
 	done
@@ -86,7 +86,7 @@ case $ARCH in
             mkdir -p dists/$CODENAME/$SECT/binary-$ARCH
 	    grep-dctrl -FFilename -e "/$SECT/" $PREFIX.Packages | \
 		grep -v ^X-Medium > dists/$CODENAME/$SECT/binary-$ARCH/Packages
-	    gzip --best -c < dists/$CODENAME/$SECT/binary-$ARCH/Packages \
+	    pigz -9nm -c < dists/$CODENAME/$SECT/binary-$ARCH/Packages \
 		> dists/$CODENAME/$SECT/binary-$ARCH/Packages.gz
 	    cp $MIRROR/dists/$CODENAME/$SECT/binary-$ARCH/Release \
    		dists/$CODENAME/$SECT/binary-$ARCH/