Index: sysutils/terraform/Makefile
===================================================================
--- sysutils/terraform/Makefile
+++ sysutils/terraform/Makefile
@@ -1,29 +1,23 @@
 # $FreeBSD$
 
 PORTNAME=	terraform
-PORTVERSION=	0.9.4
+PORTVERSION=	0.9.10
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
-MAINTAINER=	swills@FreeBSD.org
+MAINTAINER=	lifanov@FreeBSD.org
 COMMENT=	Provides a common configuration to launch infrastructure
 
 LICENSE=	MPL
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/go:lang/go
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	hashicorp
-GH_SUBDIR=	src/github.com/${GH_ACCOUNT}/${PORTNAME}
 
 PLIST_FILES=	bin/${PORTNAME}
 
-do-build:
-	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}; \
-		${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} \
-		go build -o bin/${PORTNAME}
+USES=	go
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
 .include <bsd.port.mk>
Index: sysutils/terraform/distinfo
===================================================================
--- sysutils/terraform/distinfo
+++ sysutils/terraform/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493556352
-SHA256 (hashicorp-terraform-v0.9.4_GH0.tar.gz) = aeb7ae29a8da6035d995ffb00f767911746165f4cb7432657d361f399370f377
-SIZE (hashicorp-terraform-v0.9.4_GH0.tar.gz) = 14356629
+TIMESTAMP = 1498758000
+SHA256 (hashicorp-terraform-v0.9.10_GH0.tar.gz) = 5085e034ab8044975611763b33209d32d3ae4a2bc5d62564d7043d882027a61d
+SIZE (hashicorp-terraform-v0.9.10_GH0.tar.gz) = 17784317