diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index d199c5d..c5598af 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -102,7 +102,7 @@ pkgver() {
 prepare() {
   cd "$pkgbase-stable"
 
-  git remote add upstream ../systemd/
+  git remote | grep -q upstream || git remote add upstream ../systemd/
   git fetch --all
 
   _validate_tag || return
@@ -120,11 +120,10 @@ prepare() {
   git show 'b3415f5daef49642be3d5f417b8880c078420ff7' \
     '74dd6b515fa968c5710b396a7664cac335e25ca8' \
     -- . ':!src/test/test-id128.c' | git apply --reverse --index
-}
 
-build() {
-  local timeservers=({0..3}.arch.pool.ntp.org)
+  cd ..
 
+  local timeservers=({0..3}.arch.pool.ntp.org)
   local meson_options=(
     --buildtype=release
     -Db_lto=true
@@ -147,7 +146,9 @@ build() {
   )
 
   meson "$pkgbase-stable" build "${meson_options[@]}"
+}
 
+build() {
   ninja -C build
 }