diff --git a/Makefile b/Makefile
index 1a50bb3..b5918ed 100644
--- a/Makefile
+++ b/Makefile
@@ -24,14 +24,14 @@
 print:
 	echo "Proto files: $(PROTO_FILES)"
 	echo "Python PB2 files: $(PROTO_PYTHON_PB2)"
-
+	
 # set default shell
 SHELL = bash -e -o pipefail
 
 # Generic targets
 protos: python-protos go-protos
 
-build: protos python-build go-build
+build: protos python-build go-protos
 
 test: python-test go-test
 
@@ -72,10 +72,7 @@
 
 # Go targets
 go-protos:
-	echo "FIXME: Add golang protos"
-
-go-build:
-	echo "FIXME: Add golang build"
+	./build_go_protos.sh protos
 
 go-test:
 	echo "FIXME: Add golang tests"