diff --git a/Makefile b/Makefile
index b5e32c1e0..5e4e1fd85 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ all: default
 VERSION="0.0" # dummy for now
 GIT_COMMIT=$(shell git rev-list -1 HEAD)
 
-GO_COMPILE=linuxkit/go-compile:5bf17af781df44f07906099402680b9a661f999b
+GO_COMPILE=linuxkit/go-compile:3ba94f14de51b73551417e769d122815ec917ee7
 
 MOBY?=bin/moby
 LINUXKIT?=bin/linuxkit
diff --git a/tools/go-compile/compile.sh b/tools/go-compile/compile.sh
index 5374e5660..05f48be22 100755
--- a/tools/go-compile/compile.sh
+++ b/tools/go-compile/compile.sh
@@ -88,7 +88,7 @@ test -z $(find . -type f -name "*.go" -not -path "*/vendor/*" -not -name "*.pb.*
 
 >&2 echo "go build..."
 
-if [ "$GOOS" = "darwin" ]
+if [ "$GOOS" = "darwin" -o "$GOOS" = "windows" ]
 then
 	if [ -z "$ldflags" ]
 	then