diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index b4166a7963c..6af85a62803 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -1,6 +1,6 @@
 # Template file for 'terraform'
 pkgname=terraform
-version=0.6.15
+version=0.6.16
 revision=1
 build_style=go
 short_desc="A tool for building, changing, and combining infrastructure"
@@ -9,4 +9,22 @@ license="MPL-2.1"
 homepage="https://www.terraform.io/"
 go_import_path="github.com/hashicorp/$pkgname"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
-checksum=5dc7cb1d29dee3de9ed9efacab7e72aa447052c96ae8269d932f6a979871a852
+checksum=c84bae32a170d993982de9c537eac74f70601e7a667dc2ea9803b86e04b1221d
+
+post_build() {
+	for F in $(find -type f -name main.go); do
+		go get -x $go_import_path/${F%/*}
+	done
+}
+
+
+do_install() {
+	find "${GOPATH}/bin" -type f -executable | while read line
+	do
+		if [ "$(basename $line)" = terraform ]; then
+			vbin $line
+		else
+			vbin $line terraform-$(basename $line)
+		fi
+	done
+}