diff --git a/srcpkgs/PopCorn/template b/srcpkgs/PopCorn/template
index fe84490de6b..da4bfa9deac 100644
--- a/srcpkgs/PopCorn/template
+++ b/srcpkgs/PopCorn/template
@@ -1,14 +1,14 @@
 # Template file for 'PopCorn'
 pkgname=PopCorn
 version=0.4
-revision=4
+revision=5
 build_style=go
 go_import_path=github.com/the-maldridge/popcorn
 go_package="${go_import_path}/cmd/popcorn
  ${go_import_path}/cmd/popcornctl
  ${go_import_path}/cmd/statrepo
  ${go_import_path}/cmd/pqueryd"
-hostmakedepends="git"
+hostmakedepends="git gcc-go-tools"
 depends="snooze"
 short_desc="Package statistics system"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
@@ -17,10 +17,6 @@ homepage="https://github.com/the-maldridge/PopCorn"
 distfiles="https://github.com/the-maldridge/PopCorn/archive/v${version}.tar.gz"
 checksum=b25589802c5e1c277d2e9536add44704a012359b02d7fb4be1b4b0f11eb10d93
 
-if [ -z "$CROSS_BUILD" -o "$XBPS_TARGET_LIBC" != "musl" ]; then
-	hostmakedepends+=" gcc-go-tools"
-fi
-
 system_accounts="_popcorn"
 _popcorn_homedir="/var/lib/popcorn"
 make_dirs="