diff --git a/devel/go-bindata/Makefile b/devel/go-bindata/Makefile
index 5d08880d52cc..f014d1d2e692 100644
--- a/devel/go-bindata/Makefile
+++ b/devel/go-bindata/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	go-bindata
-PORTVERSION=	3.0.7
+PORTVERSION=	3.1.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
@@ -12,25 +12,18 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jteeuwen
+GH_TAGNAME=	a0ff256
+GH_SUBDIR=	src/github.com/jteeuwen/go-bindata
 
 PLIST_FILES=	bin/go-bindata
 
 PORTDOCS=	CONTRIBUTING.md LICENSE README.md
 
-STRIP=		# stripping can break go binaries
-
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@cd ${WRKSRC} ; ${MKDIR} src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \
-	${MV} CONTRIBUTING.md LICENSE README.md asset.go bytewriter.go \
-	config.go convert.go debug.go doc.go go-bindata release.go \
-	stringwriter.go testdata toc.go \
-	src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
-
 do-build:
 	cd ${WRKSRC} ; \
-		${SETENV} GOPATH=${WRKSRC} go install ./...
+		${SETENV} GOPATH=${WRKSRC} go build -o bin/go-bindata ./go-bindata/
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} \
diff --git a/devel/go-bindata/distinfo b/devel/go-bindata/distinfo
index 1c0ace194905..2ef253f93b5a 100644
--- a/devel/go-bindata/distinfo
+++ b/devel/go-bindata/distinfo
@@ -1,2 +1,3 @@
-SHA256 (jteeuwen-go-bindata-v3.0.7_GH0.tar.gz) = 77a7214479e5ce9004e4afa6d0eb8ce14289030fadc55a3444249ab1fe2c7980
-SIZE (jteeuwen-go-bindata-v3.0.7_GH0.tar.gz) = 13855
+TIMESTAMP = 1490733257
+SHA256 (jteeuwen-go-bindata-v3.1.0-a0ff256_GH0.tar.gz) = 06c7bb64ab428a28eb3633ae19fafb6b7b241d384ef45ac0728b1c5fbec64961
+SIZE (jteeuwen-go-bindata-v3.1.0-a0ff256_GH0.tar.gz) = 17868