diff --git a/.gitignore b/.gitignore
index 46a83f2c..c1df85ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,5 @@ _testmain.go
 weaver/weaver
 weavedns/weavedns
 tools/bin
+tools/build
 releases
diff --git a/Makefile b/Makefile
index cfe33ff8..1d492d64 100644
--- a/Makefile
+++ b/Makefile
@@ -38,8 +38,17 @@ $(WEAVER_EXE) $(WEAVEDNS_EXE): common/*.go
 $(WEAVER_EXE): router/*.go weaver/main.go
 $(WEAVEDNS_EXE): nameserver/*.go weavedns/main.go
 
+build_weavetools_exes_in_container=yes
+
 $(WEAVETOOLS_EXES): tools/build.sh
+ifdef build_weavetools_exes_in_container
 	$(SUDO) docker run --rm -v $(realpath $(<D)):/home/weave ubuntu sh /home/weave/build.sh
+else
+	rm -rf tools/build
+	mkdir tools/build
+	cd tools/build && sh ../../$<
+	rm -rf tools/build
+endif
 
 $(WEAVER_EXPORT): weaver/Dockerfile $(WEAVER_EXE)
 	$(SUDO) docker build -t $(WEAVER_IMAGE) weaver