diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 81ab8dc554d..33e7437814c 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,7 +1,7 @@
 # Template file for 'syncthing'
 pkgname=syncthing
 version=0.11.21
-revision=1
+revision=2
 build_style=go
 go_import_path="github.com/syncthing/syncthing"
 short_desc="Open Source Continuous File Synchronization"
@@ -19,15 +19,12 @@ do_build() {
 	ln -s $PWD $GOPATH/src/github.com/syncthing/${pkgname}
 
 	mkdir tmp
-	TMPDIR=${PWD}/tmp/ go run build.go -goos linux -goarch ${goarch} -no-upgrade -version "v${version}"
+	TMPDIR=${PWD}/tmp/ go run build.go -goarch ${goarch} -no-upgrade -version "v${version}" build
 	rm -rf tmp
 }
 
 do_install() {
-	case "$XBPS_TARGET_MACHINE" in
-		arm*) vbin bin/linux_arm/syncthing;;
-		x86_64*|i686*) vbin bin/syncthing;;
-	esac
+	vbin syncthing
 	vlicense LICENSE
 	vdoc README.md
 }