diff --git a/benchmarks/bombardier/Makefile b/benchmarks/bombardier/Makefile
index 4b01f97a3dc2..8f63db42b32a 100644
--- a/benchmarks/bombardier/Makefile
+++ b/benchmarks/bombardier/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bombardier
-PORTVERSION=	1.1.2
+PORTVERSION=	1.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	benchmarks
 
@@ -11,18 +11,24 @@ COMMENT=	Fast cross-platform HTTP benchmarking tool written in Go
 
 LICENSE=	MIT
 
+USES=		go
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	codesenberg
-USES=		go
 
 PLIST_FILES=	bin/${PORTNAME}
 
+post-patch:
+	${MKDIR} ${WRKDIR}/src/github.com/${GH_ACCOUNT}
+	${LN} -s ${WRKSRC} ${WRKDIR}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
+
 do-build:
-	cd ${WRKSRC}; \
-		${LN} -s vendor src; \
-		${SETENV} ${MAKE_ENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -ldflags "-X main.version=${PORTVERSION}" .
+	cd ${WRKDIR}/src/github.com/${GH_ACCOUNT}/${PORTNAME} && \
+		GOPATH=${WRKDIR} go build -ldflags "-X main.version=${PORTVERSION}" .
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-${PORTVERSION} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_PROGRAM} \
+		${WRKDIR}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/${PORTNAME} \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/benchmarks/bombardier/distinfo b/benchmarks/bombardier/distinfo
index b85bcb25c696..a9da23f70f81 100644
--- a/benchmarks/bombardier/distinfo
+++ b/benchmarks/bombardier/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1525311478
-SHA256 (codesenberg-bombardier-v1.1.2_GH0.tar.gz) = 169b77d083f1ac72a39f33604d2dc8ea9d0fbfbf379565e43686a7c8271b4493
-SIZE (codesenberg-bombardier-v1.1.2_GH0.tar.gz) = 579212
+TIMESTAMP = 1530975513
+SHA256 (codesenberg-bombardier-v1.2_GH0.tar.gz) = 7edefaa3705b90e8ec412a78f5061dfde580559e142c784bad2972ee30fd01f1
+SIZE (codesenberg-bombardier-v1.2_GH0.tar.gz) = 591331