diff --git a/hack/make/gccgo b/hack/make/gccgo
index 93e064a..20eb8dc 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)"
@@ -21,7 +21,7 @@ go build -compiler=gccgo \
 		-g
 		$EXTLDFLAGS_STATIC
 		-Wl,--no-export-dynamic
-		-ldl
+		-ldl -lsystemd
 		-pthread
 	" \
 	./cmd/dockerd
@@ -37,9 +37,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