diff --git a/Makefile b/Makefile
index 4793c3bcc0..ed347199e5 100644
--- a/Makefile
+++ b/Makefile
@@ -100,8 +100,8 @@ dist/flanneld-$(ARCH):
 	# valid values for $$ARCH are [amd64 arm arm64 ppc64le]
 	docker run -e CC=$(CC) -e GOARM=$(GOARM) -e GOARCH=$(ARCH) \
 		-u $(shell id -u):$(shell id -g) \
-	    -v ${PWD}:/go/src/github.com/coreos/flannel:ro \
-        -v ${PWD}/dist:/go/src/github.com/coreos/flannel/dist \
+	    -v $(CURDIR):/go/src/github.com/coreos/flannel:ro \
+        -v $(CURDIR)/dist:/go/src/github.com/coreos/flannel/dist \
 	    gcr.io/google_containers/kube-cross:$(KUBE_CROSS_TAG) /bin/bash -c '\
 		cd /go/src/github.com/coreos/flannel && \
 		CGO_ENABLED=1 make -e dist/flanneld && \
@@ -116,8 +116,8 @@ dist/libpthread.so.0-$(ARCH):
 dist/iptables-$(ARCH):
 	docker run -e CC=$(CC) -e GOARM=$(GOARM) -e GOARCH=$(ARCH) \
 			-u $(shell id -u):$(shell id -g) \
-            -v ${PWD}:/go/src/github.com/coreos/flannel:ro \
-            -v ${PWD}/dist:/go/src/github.com/coreos/flannel/dist \
+            -v $(CURDIR):/go/src/github.com/coreos/flannel:ro \
+            -v $(CURDIR)/dist:/go/src/github.com/coreos/flannel/dist \
             gcr.io/google_containers/kube-cross:$(KUBE_CROSS_TAG) /bin/bash -c '\
             curl -sSL http://www.netfilter.org/projects/iptables/files/iptables-$(IPTABLES_VERSION).tar.bz2 | tar -jxv && \
             cd iptables-$(IPTABLES_VERSION) && \