diff --git a/devel/goprotobuf/Makefile b/devel/goprotobuf/Makefile
index a999e988dc09..e63c2f93cff5 100644
--- a/devel/goprotobuf/Makefile
+++ b/devel/goprotobuf/Makefile
@@ -2,24 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	goprotobuf
-PORTVERSION=	20170527
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.1.0
+PORTEPOCH=	1
 CATEGORIES=	devel
 
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	Go support for Google's protocol buffers
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	go:lang/go
 RUN_DEPENDS=	protoc:devel/protobuf
 
-USES=		go
-GO_PKGNAME=	github.com/golang/protobuf
-GO_TARGET=	${GO_PKGNAME}/proto \
-		${GO_PKGNAME}/protoc-gen-go \
-		${GO_PKGNAME}/jsonpb
 USE_GITHUB=	yes
 GH_ACCOUNT=	golang
 GH_PROJECT=	protobuf
-GH_TAGNAME=	9f174c9
+GH_SUBDIR=	src/github.com/golang/protobuf
+GH_TUPLE=	google:go-genproto:02b4e95:genproto/src/google.golang.org/genproto
+
+PLIST_FILES=	bin/protoc-gen-go
+
+do-build:
+	@cd ${WRKSRC}/protoc-gen-go && ${SETENV} ${MAKE_ENV} GOPATH=${WRKSRC} go build
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/protoc-gen-go/protoc-gen-go ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/devel/goprotobuf/distinfo b/devel/goprotobuf/distinfo
index d993c6b4152e..33d80fba5cf0 100644
--- a/devel/goprotobuf/distinfo
+++ b/devel/goprotobuf/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1495867884
-SHA256 (golang-protobuf-20170527-9f174c9_GH0.tar.gz) = 150eb67cd2cf7d00e5cfc322c9d563843389716ab3713a61e8cc2c10289d50e2
-SIZE (golang-protobuf-20170527-9f174c9_GH0.tar.gz) = 252154
+TIMESTAMP = 1532443980
+SHA256 (golang-protobuf-v1.1.0_GH0.tar.gz) = c086490e7b116b73b7e3e6058eae997576d0523ad8f1b2ec2b698887e62b14a8
+SIZE (golang-protobuf-v1.1.0_GH0.tar.gz) = 324733
+SHA256 (google-go-genproto-02b4e95_GH0.tar.gz) = 71421ee0c9af39492dad0c63736e0e3771ecd41066034f77472bd922208fcdfd
+SIZE (google-go-genproto-02b4e95_GH0.tar.gz) = 2091400
diff --git a/devel/goprotobuf/pkg-plist b/devel/goprotobuf/pkg-plist
deleted file mode 100644
index 7337685bcd2b..000000000000
--- a/devel/goprotobuf/pkg-plist
+++ /dev/null
@@ -1,43 +0,0 @@
-bin/protoc-gen-go
-%%GO_LIBDIR%%/%%GO_PKGNAME%%/jsonpb.a
-%%GO_LIBDIR%%/%%GO_PKGNAME%%/proto.a
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/jsonpb/jsonpb.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/jsonpb/jsonpb_test.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/jsonpb/jsonpb_test_proto/Makefile
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/jsonpb/jsonpb_test_proto/more_test_objects.pb.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/jsonpb/jsonpb_test_proto/more_test_objects.proto
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/jsonpb/jsonpb_test_proto/test_objects.pb.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/jsonpb/jsonpb_test_proto/test_objects.proto
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/Makefile
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/all_test.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/any_test.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/clone.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/clone_test.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/decode.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/decode_test.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/encode.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/encode_test.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/equal.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/equal_test.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/extensions.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/extensions_test.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/lib.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/map_test.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/message_set.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/message_set_test.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/pointer_reflect.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/pointer_unsafe.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/properties.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/proto3_proto/proto3.pb.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/proto3_proto/proto3.proto
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/proto3_test.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/size2_test.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/size_test.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/testdata/Makefile
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/testdata/golden_test.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/testdata/test.pb.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/testdata/test.proto
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/text.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/text_parser.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/text_parser_test.go
-%%GO_SRCDIR%%/%%GO_PKGNAME%%/proto/text_test.go