diff --git a/Makefile b/Makefile
index 7acf02858..b36f0b7d0 100644
--- a/Makefile
+++ b/Makefile
@@ -81,5 +81,6 @@ ifndef HAS_GIT
 	$(error You must install Git)
 endif
 	glide install
+	go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go
 
 include versioning.mk
diff --git a/_proto/Makefile b/_proto/Makefile
index c1dffe424..1f188adfc 100644
--- a/_proto/Makefile
+++ b/_proto/Makefile
@@ -22,16 +22,18 @@ services_pkg = services
 
 google_deps	 = Mgoogle/protobuf/timestamp.proto=github.com/golang/protobuf/ptypes/timestamp,Mgoogle/protobuf/any.proto=github.com/golang/protobuf/ptypes/any
 
+.PHONY: all
 all: chart release services
 
 chart:
-	protoc --$(target)_out=plugins=$(plugins),$(google_deps),$(chart_ias):$(dst) $(chart_pbs)
+	PATH=../bin:$(PATH) protoc --$(target)_out=plugins=$(plugins),$(google_deps),$(chart_ias):$(dst) $(chart_pbs)
 
 release:
-	protoc --$(target)_out=plugins=$(plugins),$(google_deps),$(chart_ias):$(dst) $(release_pbs)
+	PATH=../bin:$(PATH) protoc --$(target)_out=plugins=$(plugins),$(google_deps),$(chart_ias):$(dst) $(release_pbs)
 
 services:
-	protoc --$(target)_out=plugins=$(plugins),$(google_deps),$(chart_ias),$(release_ias):$(dst) $(services_pbs)
+	PATH=../bin:$(PATH) protoc --$(target)_out=plugins=$(plugins),$(google_deps),$(chart_ias),$(release_ias):$(dst) $(services_pbs)
 
+.PHONY: clean
 clean:
 	@rm -rf $(dst)/hapi 2>/dev/null