diff --git a/Makefile b/Makefile
index 52017488..82fdf0d0 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ PROTOC_IMAGE=namely/protoc:1.23_0
 protos:
 	docker run $(RM) --user $(id -u):$(id -g) -v $(shell pwd):/go/src/github.com/weaveworks/common -w /go/src/github.com/weaveworks/common $(PROTOC_IMAGE) --proto_path=/go/src/github.com/weaveworks/common --go_out=plugins=grpc:/go/src/ server/fake_server.proto
 	docker run $(RM) --user $(id -u):$(id -g) -v $(shell pwd):/go/src/github.com/weaveworks/common -w /go/src/github.com/weaveworks/common $(PROTOC_IMAGE) --proto_path=/go/src/github.com/weaveworks/common --go_out=plugins=grpc:/go/src/ middleware/middleware_test/echo_server.proto
-	docker run $(RM) --user $(id -u):$(id -g) -v $(shell pwd):/go/src/github.com/weaveworks/common -w /go/src/github.com/weaveworks/common $(PROTOC_IMAGE) -I/go/src/github.com/weaveworks/common -I/go/src/github.com/weaveworks/common/vendor --proto_path=/go/src/github.com/weaveworks/common --gogofast_out=plugins=grpc:/go/src/ httpgrpc/httpgrpc.proto
+	docker run $(RM) --user $(id -u):$(id -g) -v $(shell pwd):/go/src/github.com/weaveworks/common -w /go/src/github.com/weaveworks/common $(PROTOC_IMAGE) -I/go/src/github.com/weaveworks/common -I/go/src/github.com/weaveworks/common/vendor/github.com/gogo/protobuf/ --proto_path=/go/src/github.com/weaveworks/common --gogofast_out=plugins=grpc:/go/src/ httpgrpc/httpgrpc.proto
 
 protos: $(GENERATED_PROTOS)
 
diff --git a/httpgrpc/httpgrpc.pb.go b/httpgrpc/httpgrpc.pb.go
index 646773fd..4b3f6ad9 100644
--- a/httpgrpc/httpgrpc.pb.go
+++ b/httpgrpc/httpgrpc.pb.go
@@ -216,28 +216,28 @@ func init() {
 func init() { proto.RegisterFile("httpgrpc/httpgrpc.proto", fileDescriptor_6670c8e151665986) }
 
 var fileDescriptor_6670c8e151665986 = []byte{
-	// 333 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xc1, 0x4e, 0xfa, 0x40,
-	0x10, 0xc6, 0xbb, 0x94, 0x7f, 0xff, 0xb2, 0x70, 0x20, 0x9b, 0x88, 0x0d, 0x87, 0x0d, 0x21, 0x31,
-	0x21, 0x26, 0xd2, 0x04, 0x4f, 0x1e, 0xd5, 0x0b, 0x37, 0xcd, 0x86, 0x93, 0xb7, 0x96, 0x8e, 0xad,
-	0x81, 0x32, 0xb5, 0xdd, 0x42, 0xb8, 0xf9, 0x08, 0x3e, 0x86, 0x8f, 0xe2, 0x91, 0x23, 0x47, 0x29,
-	0x2f, 0xe0, 0x23, 0x98, 0xdd, 0x52, 0x6c, 0x3c, 0x79, 0xfb, 0xbe, 0xd9, 0x6f, 0xf7, 0x37, 0xb3,
-	0x43, 0xcf, 0x42, 0x29, 0xe3, 0x20, 0x89, 0xa7, 0x4e, 0x29, 0x86, 0x71, 0x82, 0x12, 0xd9, 0x49,
-	0xe9, 0xbb, 0x97, 0xc1, 0xb3, 0x0c, 0x33, 0x6f, 0x38, 0xc5, 0xc8, 0x09, 0x30, 0x40, 0x47, 0x07,
-	0xbc, 0xec, 0x49, 0x3b, 0x6d, 0xb4, 0x2a, 0x2e, 0xf6, 0x57, 0xb4, 0x39, 0x9e, 0x4c, 0x1e, 0x04,
-	0xbc, 0x64, 0x90, 0x4a, 0xd6, 0xa1, 0x56, 0x04, 0x32, 0x44, 0xdf, 0x26, 0x3d, 0x32, 0x68, 0x88,
-	0x83, 0x63, 0x6d, 0x6a, 0x66, 0xc9, 0xdc, 0xae, 0xe9, 0xa2, 0x92, 0xec, 0x82, 0xfe, 0x0f, 0xc1,
-	0xf5, 0x21, 0x49, 0x6d, 0xb3, 0x67, 0x0e, 0x9a, 0xa3, 0xf6, 0xf0, 0xd8, 0xd3, 0x58, 0x1f, 0x88,
-	0x32, 0xc0, 0x18, 0xad, 0x7b, 0xe8, 0xaf, 0xed, 0x7a, 0x8f, 0x0c, 0x5a, 0x42, 0xeb, 0xbe, 0x47,
-	0x5b, 0x05, 0x38, 0x8d, 0x71, 0x91, 0x82, 0xca, 0xdc, 0xa1, 0x0f, 0x9a, 0xfb, 0x4f, 0x68, 0x5d,
-	0x65, 0xd4, 0xfe, 0xca, 0x30, 0x2b, 0x8c, 0x11, 0xb5, 0x8a, 0x98, 0xea, 0x7f, 0x06, 0xeb, 0xc3,
-	0x50, 0x4a, 0xaa, 0x49, 0x97, 0xee, 0x3c, 0x83, 0xe2, 0xe9, 0x86, 0x38, 0xb8, 0xd1, 0x0d, 0xad,
-	0xab, 0xbe, 0xd8, 0x35, 0xb5, 0xc6, 0xee, 0xc2, 0x9f, 0x03, 0x3b, 0xad, 0x40, 0x7f, 0xbe, 0xaa,
-	0xdb, 0xf9, 0x5d, 0x2e, 0x06, 0xe9, 0x1b, 0xb7, 0xf7, 0xdb, 0x1d, 0x37, 0xbe, 0x76, 0x9c, 0xbc,
-	0xe6, 0x9c, 0xbc, 0xe7, 0x9c, 0x7c, 0xe4, 0x9c, 0x6c, 0x72, 0x4e, 0x3e, 0x73, 0x4e, 0xde, 0xf6,
-	0xdc, 0xd8, 0xec, 0xb9, 0xb1, 0xdd, 0x73, 0xe3, 0xf1, 0xbc, 0xb2, 0xac, 0x15, 0xb8, 0x4b, 0x58,
-	0x61, 0x32, 0x4b, 0x9d, 0x29, 0x46, 0x11, 0x2e, 0x8e, 0x3b, 0xf6, 0x2c, 0xbd, 0xab, 0xab, 0xef,
-	0x00, 0x00, 0x00, 0xff, 0xff, 0xf6, 0x06, 0x42, 0xe4, 0xff, 0x01, 0x00, 0x00,
+	// 322 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0x3f, 0x4f, 0xc2, 0x40,
+	0x14, 0xc0, 0x7b, 0x14, 0xab, 0x1c, 0x0c, 0xe4, 0xa2, 0xd8, 0x30, 0x5c, 0x08, 0x89, 0x09, 0x71,
+	0xa0, 0x09, 0x4e, 0x8e, 0xea, 0xc2, 0xa6, 0xb9, 0x30, 0xb9, 0xb5, 0xf4, 0xa5, 0x35, 0x50, 0x5e,
+	0x6d, 0xaf, 0x10, 0x36, 0x3f, 0x82, 0x1f, 0xc3, 0x8f, 0xe2, 0xc8, 0xc8, 0x28, 0xe5, 0x0b, 0xf8,
+	0x11, 0xcc, 0x5d, 0x29, 0x36, 0x4e, 0x6e, 0xbf, 0xf7, 0x27, 0xf7, 0x7b, 0xef, 0x1e, 0xbd, 0x0c,
+	0xa5, 0x8c, 0x83, 0x24, 0x9e, 0x3a, 0x25, 0x0c, 0xe3, 0x04, 0x25, 0xb2, 0xb3, 0x32, 0xee, 0x9e,
+	0x07, 0x18, 0xa0, 0x4e, 0x3a, 0x8a, 0x8a, 0x7a, 0x7f, 0x45, 0x9b, 0xe3, 0xc9, 0xe4, 0x49, 0xc0,
+	0x6b, 0x06, 0xa9, 0x64, 0x1d, 0x6a, 0x45, 0x20, 0x43, 0xf4, 0x6d, 0xd2, 0x23, 0x83, 0x86, 0x38,
+	0x44, 0xac, 0x4d, 0xcd, 0x2c, 0x99, 0xdb, 0x35, 0x9d, 0x54, 0xc8, 0xae, 0xe9, 0x69, 0x08, 0xae,
+	0x0f, 0x49, 0x6a, 0x9b, 0x3d, 0x73, 0xd0, 0x1c, 0xb5, 0x87, 0x47, 0xf5, 0x58, 0x17, 0x44, 0xd9,
+	0xc0, 0x18, 0xad, 0x7b, 0xe8, 0xaf, 0xed, 0x7a, 0x8f, 0x0c, 0x5a, 0x42, 0x73, 0xdf, 0xa3, 0xad,
+	0x42, 0x9c, 0xc6, 0xb8, 0x48, 0x41, 0xf5, 0x3c, 0xa0, 0x0f, 0xda, 0x7b, 0x22, 0x34, 0x57, 0x1d,
+	0xb5, 0xff, 0x3a, 0xcc, 0x8a, 0x63, 0x44, 0xad, 0xa2, 0x4d, 0xcd, 0x3f, 0x83, 0xf5, 0x61, 0x29,
+	0x85, 0x6a, 0xd3, 0xa5, 0x3b, 0xcf, 0xa0, 0x78, 0xba, 0x21, 0x0e, 0xd1, 0xe8, 0x8e, 0xd6, 0xd5,
+	0x5c, 0xec, 0x96, 0x5a, 0x63, 0x77, 0xe1, 0xcf, 0x81, 0x5d, 0x54, 0xa4, 0xbf, 0x5f, 0xd5, 0xed,
+	0xfc, 0x4d, 0x17, 0x8b, 0xf4, 0x8d, 0xfb, 0xc7, 0xed, 0x8e, 0x1b, 0xdf, 0x3b, 0x4e, 0xde, 0x72,
+	0x4e, 0x3e, 0x72, 0x4e, 0x3e, 0x73, 0x4e, 0x36, 0x39, 0x27, 0x5f, 0x39, 0x27, 0xef, 0x7b, 0x6e,
+	0x6c, 0xf6, 0xdc, 0xd8, 0xee, 0xb9, 0xf1, 0x7c, 0x15, 0xbc, 0xc8, 0x30, 0xf3, 0x86, 0x53, 0x8c,
+	0x9c, 0x15, 0xb8, 0x4b, 0x58, 0x61, 0x32, 0x4b, 0x9d, 0x29, 0x46, 0x11, 0x2e, 0x8e, 0xa7, 0xf4,
+	0x2c, 0x7d, 0xab, 0x9b, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd8, 0xb5, 0xfe, 0x5d, 0xe6, 0x01,
+	0x00, 0x00,
 }
 
 func (this *HTTPRequest) Equal(that interface{}) bool {
diff --git a/httpgrpc/httpgrpc.proto b/httpgrpc/httpgrpc.proto
index b3dd1108..0313dbb6 100644
--- a/httpgrpc/httpgrpc.proto
+++ b/httpgrpc/httpgrpc.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package httpgrpc;
 
-import "github.com/gogo/protobuf/gogoproto/gogo.proto";
+import "gogoproto/gogo.proto";
 
 option (gogoproto.equal_all) = true;
 option (gogoproto.gostring_all) =  true;