diff --git a/mk/golang.mk b/mk/golang.mk
index f53e3785984..cf8b7e421de 100644
--- a/mk/golang.mk
+++ b/mk/golang.mk
@@ -46,5 +46,10 @@ check_go_version:
 .PHONY: check_go_version
 DEPS_GO += check_go_version
 
+check_go_path:
+	bin/check_go_path $(realpath $(shell pwd)) $(realpath $(addsuffix /src/github.com/ipfs/go-ipfs,$(subst $(PATH_SEP),$(space),$(GOPATH))))
+.PHONY: check_go_path
+DEPS_GO += check_go_path
+
 TEST += $(TEST_GO)
 TEST_SHORT += test_go_fmt test_go_short
diff --git a/mk/util.mk b/mk/util.mk
index 8f76013df39..05e2dbe7521 100644
--- a/mk/util.mk
+++ b/mk/util.mk
@@ -2,8 +2,10 @@
 ifeq ($(OS),Windows_NT)
 	WINDOWS :=1
 	?exe :=.exe # windows compat
+	PATH_SEP :=;
 else
 	?exe :=
+	PATH_SEP :=:
 endif
 
 space:=