diff --git a/Makefile b/Makefile
index d73c8c13aa..aee240acee 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@
 DOCKER_ENVS := \
 	-e BUILDFLAGS \
 	-e DOCKER_CLIENTONLY \
+	-e DOCKER_DEBUG \
 	-e DOCKER_EXECDRIVER \
 	-e DOCKER_EXPERIMENTAL \
 	-e DOCKER_GRAPHDRIVER \
diff --git a/hack/make.sh b/hack/make.sh
index d098b04556..d719f3d830 100755
--- a/hack/make.sh
+++ b/hack/make.sh
@@ -128,7 +128,9 @@ fi
 
 IAMSTATIC='true'
 source "$SCRIPTDIR/make/.go-autogen"
-LDFLAGS='-w'
+if [ -z "$DOCKER_DEBUG" ]; then
+	LDFLAGS='-w'
+fi
 
 LDFLAGS_STATIC='-linkmode external'
 # Cgo -H windows is incompatible with -linkmode external.