diff --git a/hack/make/.dockerinit b/hack/make/.dockerinit
index f98158d0b9..fceba7db92 100644
--- a/hack/make/.dockerinit
+++ b/hack/make/.dockerinit
@@ -14,6 +14,7 @@ go build \
 		-extldflags \"$EXTLDFLAGS_STATIC\"
 	" \
 	./dockerinit
+
 echo "Created binary: $DEST/dockerinit-$VERSION"
 ln -sf "dockerinit-$VERSION" "$DEST/dockerinit"
 
diff --git a/hack/make/.dockerinit-gccgo b/hack/make/.dockerinit-gccgo
index 637d1fdd3f..592a4152c8 100644
--- a/hack/make/.dockerinit-gccgo
+++ b/hack/make/.dockerinit-gccgo
@@ -4,6 +4,7 @@ set -e
 IAMSTATIC="true"
 source "$(dirname "$BASH_SOURCE")/.go-autogen"
 
+# dockerinit still needs to be a static binary, even if docker is dynamic
 go build --compiler=gccgo \
 	-o "$DEST/dockerinit-$VERSION" \
 	"${BUILDFLAGS[@]}" \
diff --git a/hack/make/.integration-daemon-start b/hack/make/.integration-daemon-start
index faf9b97213..570c6c7a9a 100644
--- a/hack/make/.integration-daemon-start
+++ b/hack/make/.integration-daemon-start
@@ -2,7 +2,7 @@
 
 # see test-integration-cli for example usage of this script
 
-export PATH="$DEST/../binary:$DEST/../dynbinary:$DEST/../gccgo:$PATH"
+export PATH="$DEST/../binary:$DEST/../dynbinary:$DEST/../gccgo:$DEST/../dyngccgo:$PATH"
 
 if ! command -v docker &> /dev/null; then
 	echo >&2 'error: binary or dynbinary must be run before .integration-daemon-start'
diff --git a/hack/make/binary b/hack/make/binary
old mode 100755
new mode 100644
index 06d640dd43..0f57ea0d69
--- a/hack/make/binary
+++ b/hack/make/binary
@@ -21,6 +21,7 @@ go build \
 		$LDFLAGS_STATIC_DOCKER
 	" \
 	./docker
+
 echo "Created binary: $DEST/$BINARY_FULLNAME"
 ln -sf "$BINARY_FULLNAME" "$DEST/docker$BINARY_EXTENSION"
 
diff --git a/hack/make/dyngccgo b/hack/make/dyngccgo
index e4ccad1a9d..a76e9c5b56 100644
--- a/hack/make/dyngccgo
+++ b/hack/make/dyngccgo
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e 
+set -e
 
 DEST=$1
 
diff --git a/hack/make/gccgo b/hack/make/gccgo
old mode 100755
new mode 100644
index 8ba5ede963..c85d2fbda5
--- a/hack/make/gccgo
+++ b/hack/make/gccgo
@@ -8,10 +8,10 @@ BINARY_FULLNAME="$BINARY_NAME$BINARY_EXTENSION"
 
 source "$(dirname "$BASH_SOURCE")/.go-autogen"
 
-go build --compiler=gccgo \
+go build -compiler=gccgo \
 	-o "$DEST/$BINARY_FULLNAME" \
 	"${BUILDFLAGS[@]}" \
-	--gccgoflags "
+	-gccgoflags "
 		-g
 		$EXTLDFLAGS_STATIC_DOCKER
 		-Wl,--no-export-dynamic
@@ -19,7 +19,6 @@ go build --compiler=gccgo \
 	" \
 	./docker
 
-
 echo "Created binary: $DEST/$BINARY_FULLNAME"
 ln -sf "$BINARY_FULLNAME" "$DEST/docker$BINARY_EXTENSION"