diff --git a/.gitignore b/.gitignore
index 2a86e41caf..68d2da95bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 .vagrant*
 bin
 docker/docker
+*.exe
 .*.swp
 a.out
 *.orig
diff --git a/Dockerfile b/Dockerfile
index 65d9a0d171..344551d35d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -68,7 +68,8 @@ RUN	cd /usr/local/go/src && ./make.bash --no-clean 2>&1
 ENV	DOCKER_CROSSPLATFORMS	\
 	linux/386 linux/arm \
 	darwin/amd64 darwin/386 \
-	freebsd/amd64 freebsd/386 freebsd/arm
+	freebsd/amd64 freebsd/386 freebsd/arm \
+	windows/amd64 windows/386
 # (set an explicit GOARM of 5 for maximum compatibility)
 ENV	GOARM	5
 RUN	cd /usr/local/go/src && bash -xc 'for platform in $DOCKER_CROSSPLATFORMS; do GOOS=${platform%/*} GOARCH=${platform##*/} ./make.bash --no-clean 2>&1; done'
diff --git a/project/make/binary b/project/make/binary
index b97069a856..962bebc68d 100755
--- a/project/make/binary
+++ b/project/make/binary
@@ -2,16 +2,20 @@
 set -e
 
 DEST=$1
+BINARY_NAME="docker-$VERSION"
+if [ "$(go env GOOS)" = 'windows' ]; then
+	BINARY_NAME+='.exe'
+fi
 
 go build \
-	-o "$DEST/docker-$VERSION" \
+	-o "$DEST/$BINARY_NAME" \
 	"${BUILDFLAGS[@]}" \
 	-ldflags "
 		$LDFLAGS
 		$LDFLAGS_STATIC_DOCKER
 	" \
 	./docker
-echo "Created binary: $DEST/docker-$VERSION"
-ln -sf "docker-$VERSION" "$DEST/docker"
+echo "Created binary: $DEST/$BINARY_NAME"
+ln -sf "$BINARY_NAME" "$DEST/docker"
 
-hash_files "$DEST/docker-$VERSION"
+hash_files "$DEST/$BINARY_NAME"