diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 7c01684..2e54012 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -11,7 +11,7 @@ arch=('x86_64')
 url="https://syncthing.net/"
 license=('MPL')
 depends=('glibc')
-makedepends=('git' 'go' 'inetutils')
+makedepends=('git' 'go')
 # options=('!strip')
 source=(https://github.com/syncthing/syncthing/releases/download/v$pkgver/syncthing-source-v${pkgver}.tar.gz{,.asc}
         syncthing-relaysrv.sysusers
@@ -34,17 +34,29 @@ prepare() {
   patch -Np1 -i "${srcdir}/gcc-pie-segfaults-race.patch"
 }
 
+_build() {
+  go build \
+    -trimpath \
+    -buildmode=pie \
+    -mod=readonly \
+    -modcacherw \
+    -ldflags="-X github.com/syncthing/syncthing/lib/build.Version=v$pkgver \
+      -X github.com/syncthing/syncthing/lib/build.User=${pkgbase} \
+      -X github.com/syncthing/syncthing/lib/build.Host=archlinux \
+      -X github.com/syncthing/syncthing/lib/build.Stamp="$(date -u +%s ${SOURCE_DATE_EPOCH:+-d@$SOURCE_DATE_EPOCH})" \
+      -linkmode external -extldflags \"${LDFLAGS}\"" -tags 'noupgrade purego' \
+    $1
+}
+
 build() {
-  export BUILD_HOST=archlinux
   export GOPATH="${srcdir}" GOROOT_FINAL="/usr/bin"
   cd "${srcdir}/src/github.com/syncthing/${pkgbase}"
   export CGO_CPPFLAGS="${CPPFLAGS}"
   export CGO_CFLAGS="${CFLAGS}"
   export CGO_CXXFLAGS="${CXXFLAGS}"
-  export CGO_LDFLAGS="${LDFLAGS}"
-  export GOFLAGS="-buildmode=pie -trimpath -mod=readonly -modcacherw"
-  go run build.go -no-upgrade -version v${pkgver} build
-  go run build.go -no-upgrade -version v${pkgver} build strelaysrv
+
+  _build  "$PWD"/cmd/syncthing
+  _build  "$PWD"/cmd/strelaysrv
 }
 
 check() {