diff --git a/armv7h/flucky/PKGBUILD b/armv7h/flucky/PKGBUILD
index e74ee48..5abb805 100644
--- a/armv7h/flucky/PKGBUILD
+++ b/armv7h/flucky/PKGBUILD
@@ -12,11 +12,13 @@ source=("git+https://github.com/volker-raschek/flucky#tag=${pkgver}")
 sha256sums=('SKIP')
 
 build() {
-  cd "${srcdir}/${pkgname}"
-  make bin/linux/arm/7/flucky VERSION=${pkgver}
+  GOBIN=${HOME}/go/bin
+  PATH=$GOBIN:$PATH
+  go get -u github.com/go-bindata/go-bindata/...
+  make -C "${srcdir}/${pkgname}" bin/linux/arm/7/${pkgname} VERSION=${pkgver}
 }
 
 package() {
-  install -Dm4755 "${srcdir}/${pkgname}/bin/linux/arm/7/flucky" "$pkgdir/usr/bin/flucky"
+  install -Dm4755 "${srcdir}/${pkgname}/bin/linux/arm/7/${pkgname}" "$pkgdir/usr/bin/flucky"
   install -Dm644 "${srcdir}/${pkgname}/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
\ No newline at end of file
diff --git a/x86_64/flucky/PKGBUILD b/x86_64/flucky/PKGBUILD
index 5d936a8..93b1f41 100644
--- a/x86_64/flucky/PKGBUILD
+++ b/x86_64/flucky/PKGBUILD
@@ -12,8 +12,10 @@ source=("git+https://github.com/volker-raschek/flucky#tag=${pkgver}")
 sha256sums=('SKIP')
 
 build() {
-  cd "${srcdir}/${pkgname}"
-  make bin/linux/amd64/flucky VERSION=${pkgver}
+  GOBIN=${HOME}/go/bin
+  PATH=$GOBIN:$PATH
+  go get -u github.com/go-bindata/go-bindata/...
+  make -C "${srcdir}/${pkgname}" bin/linux/amd64/${pkgname} VERSION=${pkgver}
 }
 
 package() {