diff --git a/src/arch-nspawn.in b/src/arch-nspawn.in
index 3b5ba1a..2339c32 100644
--- a/src/arch-nspawn.in
+++ b/src/arch-nspawn.in
@@ -138,4 +138,4 @@ else
 	set_arch="${CARCH}"
 fi
 
-exec ${CARCH:+setarch "$set_arch"} systemd-nspawn "${nspawn_args[@]}" "$@"
+exec systemd-nspawn "${nspawn_args[@]}" "$@"
diff --git a/src/makechrootpkg.in b/src/makechrootpkg.in
index 753c52b..6253004 100644
--- a/src/makechrootpkg.in
+++ b/src/makechrootpkg.in
@@ -244,7 +244,7 @@ download_sources() {
 	# Ensure sources are downloaded
 	sudo -u "$makepkg_user" --preserve-env=GNUPGHOME,SSH_AUTH_SOCK \
 		env SRCDEST="$SRCDEST" BUILDDIR="$WORKDIR" \
-		makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o "${verifysource_args[@]}" ||
+		makepkg -A --config="$copydir/etc/makepkg.conf" --verifysource -o "${verifysource_args[@]}" ||
 		die "Could not download sources."
 }