diff --git a/hack/make/gccgo b/hack/make/gccgo
index 54c983e..1c11bbf 100644
--- a/hack/make/gccgo
+++ b/hack/make/gccgo
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -e
+set -ex
 
 BINARY_NAME="dockerd-$VERSION"
 BINARY_EXTENSION="$(binary_extension)"
@@ -22,9 +22,11 @@ go build -compiler=gccgo \
 	"${BUILDFLAGS[@]}" \
 	-gccgoflags "
 		-g
+		-Wl,--add-needed -Wl,--no-as-needed
 		$EXTLDFLAGS_STATIC
+                -static-libgo
 		-Wl,--no-export-dynamic
-		-ldl
+		-ldl -lselinux -lsystemd
 		-pthread
 	" \
 	./cmd/dockerd
@@ -37,7 +39,9 @@ go build -compiler=gccgo \
 	"${BUILDFLAGS[@]}" \
 	-gccgoflags "
 		-g
+		-Wl,--add-needed -Wl,--no-as-needed
 		$EXTLDFLAGS_STATIC
+                -static-libgo
 		-Wl,--no-export-dynamic
 		-ldl
 		-pthread
@@ -55,9 +59,11 @@ go build -compiler=gccgo \
 	"${BUILDFLAGS[@]}" \
 	-gccgoflags "
 		-g
+		-Wl,--add-needed -Wl,--no-as-needed
 		$EXTLDFLAGS_STATIC
+		-static-libgo
 		-Wl,--no-export-dynamic
-		-ldl
+		-ldl -lselinux -lsystemd
 		-pthread
 	" \
 	./cmd/docker