diff --git a/devel/gb/Makefile b/devel/gb/Makefile
index 1ea5672a65d6..4ed83d91b41b 100644
--- a/devel/gb/Makefile
+++ b/devel/gb/Makefile
@@ -1,49 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	gb
-PORTVERSION=	0.0.0.2015080301
+PORTVERSION=	0.1.0
+DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Project based build tool for Go
 
+LICENSE=	MIT
+
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	constabulary
-GH_TAGNAME=	04254de
 
 PLIST_FILES=	bin/gb bin/gb-vendor
 
-PORTDOCS=	README.md LICENSE
+PORTDOCS=	README.md
 
 STRIP=		# stripping can break go binaries
-
-.include <bsd.port.options.mk>
-
-post-extract:
-	@cd ${WRKSRC} ; ${MKDIR} src/github.com/${GH_ACCOUNT}/${GH_PROJECT} ; \
-		${MV} .gitignore LICENSE README.md build.go build_test.go \
-		cgo.go cgo14.go cgo15.go cmd context.go context_test.go \
-		defaultcc.go defaultcc_bsd.go example_test.go gb.go gb_test.go \
-		gc.go gc14.go gc15.go install.go log.go package.go \
-		package_test.go project.go src.go stdlib.go target.go testdata \
-		vendor wercker.yml \
-		src/github.com/${GH_ACCOUNT}/${GH_PROJECT}
-
-do-build:
-	@cd ${WRKSRC} ; \
-		${SETENV} GOPATH=${WRKSRC} go install ./...
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
+GO_TARGET=	./...
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/gb \
-		${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/gb-vendor \
-		${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/* ${STAGEDIR}/${LOCALBASE}/bin
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${CP} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/README.md \
-		${STAGEDIR}${DOCSDIR}
-	${CP} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/LICENSE \
-		${STAGEDIR}${DOCSDIR}
+	( cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ ; )
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/lang/go/files/bsd.go.mk"
+.include <bsd.port.post.mk>
diff --git a/devel/gb/distinfo b/devel/gb/distinfo
index 5ba4be863c92..67083c1e69ae 100644
--- a/devel/gb/distinfo
+++ b/devel/gb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (constabulary-gb-0.0.0.2015080301-04254de_GH0.tar.gz) = bd1b54c9b7cf02ea129c9c6e0a91ee8449bd9e4a64fc0d8de7b74e7e5f868267
-SIZE (constabulary-gb-0.0.0.2015080301-04254de_GH0.tar.gz) = 54735
+SHA256 (constabulary-gb-v0.1.0_GH0.tar.gz) = 7a0a77318dfd5f7f4a2c42d6f3cd99134fff1d6152f8649243126ef990befe54
+SIZE (constabulary-gb-v0.1.0_GH0.tar.gz) = 61599