diff --git a/hack/make.sh b/hack/make.sh
index 950b426a77..e1ea573e12 100755
--- a/hack/make.sh
+++ b/hack/make.sh
@@ -302,10 +302,12 @@ copy_containerd() {
             cp /usr/local/bin/ctr "$dir/"
             cp /usr/local/bin/containerd "$dir/"
             cp /usr/local/bin/containerd-shim "$dir/"
-            hash_files "$dir/runc"
-            hash_files "$dir/ctr"
-            hash_files "$dir/containerd"
-            hash_files "$dir/containerd-shim"
+            if [ "$2" == "hash" ]; then
+                hash_files "$dir/runc"
+                hash_files "$dir/ctr"
+                hash_files "$dir/containerd"
+                hash_files "$dir/containerd-shim"
+            fi
         fi
         )
     fi
diff --git a/hack/make/binary b/hack/make/binary
index 119c38342e..378af761be 100644
--- a/hack/make/binary
+++ b/hack/make/binary
@@ -61,5 +61,5 @@ go build \
 echo "Created binary: $DEST/$BINARY_FULLNAME"
 ln -sf "$BINARY_FULLNAME" "$DEST/docker$BINARY_EXTENSION"
 
-copy_containerd "$DEST"
+copy_containerd "$DEST" "hash"
 hash_files "$DEST/$BINARY_FULLNAME"
diff --git a/hack/make/gccgo b/hack/make/gccgo
index f7a1530235..9da203ff79 100644
--- a/hack/make/gccgo
+++ b/hack/make/gccgo
@@ -26,5 +26,5 @@ go build -compiler=gccgo \
 echo "Created binary: $DEST/$BINARY_FULLNAME"
 ln -sf "$BINARY_FULLNAME" "$DEST/docker$BINARY_EXTENSION"
 
-copy_containerd "$DEST"
+copy_containerd "$DEST" "hash"
 hash_files "$DEST/$BINARY_FULLNAME"
diff --git a/hack/make/tgz b/hack/make/tgz
index 19f391ef51..93a69cbe53 100644
--- a/hack/make/tgz
+++ b/hack/make/tgz
@@ -9,9 +9,10 @@ if [ ! -d "$CROSS/linux/amd64" ]; then
 	false
 fi
 
+(
 for d in "$CROSS/"*/*; do
-	GOARCH="$(basename "$d")"
-	GOOS="$(basename "$(dirname "$d")")"
+	export GOARCH="$(basename "$d")"
+	export GOOS="$(basename "$(dirname "$d")")"
 	BINARY_NAME="docker-$VERSION"
 	BINARY_EXTENSION="$(export GOOS && binary_extension)"
 	BINARY_FULLNAME="$BINARY_NAME$BINARY_EXTENSION"
@@ -32,3 +33,4 @@ for d in "$CROSS/"*/*; do
 
 	echo "Created tgz: $TGZ"
 done
+)