diff --git a/srcpkgs/flannel/template b/srcpkgs/flannel/template
index 4083f9bc1df..9c9b7450cae 100644
--- a/srcpkgs/flannel/template
+++ b/srcpkgs/flannel/template
@@ -12,6 +12,10 @@ homepage="https://$go_import_path"
 distfiles="$homepage/archive/v${version}.tar.gz"
 checksum=16764a5bdceb46ca2cdce4a88c4974fba6f1ed3e58003f5d71447f0f3f2b631a
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) broken="go i686 is broken for now";;
+esac
+
 pre_build() {
 	CGO_CFLAGS="${CGO_CFLAGS/-O2/}" # Disable optimizations because of a cgo bug in Go 1.6
 }
diff --git a/srcpkgs/forego/template b/srcpkgs/forego/template
index 37bf65f59c2..996ffe88cdd 100644
--- a/srcpkgs/forego/template
+++ b/srcpkgs/forego/template
@@ -11,3 +11,7 @@ go_import_path="github.com/ddollar/forego"
 homepage="https://$go_import_path"
 distfiles="$homepage/archive/$version.tar.gz"
 checksum=ceac6c3c5b1a12c37979e883843a324b07e05ec0960198c1a32980fdb79d7d25
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*) broken="go i686 is broken for now";;
+esac
diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template
index ace968b66c1..14bdef2768c 100644
--- a/srcpkgs/terraform/template
+++ b/srcpkgs/terraform/template
@@ -5,8 +5,12 @@ revision=1
 build_style=go
 short_desc="A tool for building, changing, and combining infrastructure"
 maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
-license="MPL-2.1"
+license="MPL-2.0"
 homepage="https://www.terraform.io/"
 go_import_path="github.com/hashicorp/$pkgname"
 distfiles="https://$go_import_path/archive/v$version.tar.gz"
 checksum=71e93503614f073f00eb65b1379ac6b80ea8a881998490a016af15208853be73
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*) broken="go i686 is broken for now";;
+esac