diff --git a/srcpkgs/xbps/template b/srcpkgs/xbps/template
index 66deab88d1b..e43050da90e 100644
--- a/srcpkgs/xbps/template
+++ b/srcpkgs/xbps/template
@@ -1,7 +1,7 @@
 # Template file for 'xbps'
 pkgname=xbps
 version=0.59.1
-revision=2
+revision=3
 bootstrap=yes
 build_style=configure
 short_desc="XBPS package system utilities"
@@ -33,21 +33,23 @@ fi
 do_configure() {
 	./configure --prefix=/usr --sysconfdir=/etc ${CHROOT_READY:+--enable-tests}
 }
+
 post_install() {
+	local _repo="repository=https://alpha.de.repo.voidlinux.org" _suffix=
 	case "$XBPS_TARGET_MACHINE" in
 	aarch64*) # XXX different repo location
-		echo "repository=https://alpha.de.repo.voidlinux.org/current/aarch64" > \
-			${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
+		_suffix="/aarch64"
 		;;
 	*-musl) # XXX different repo location
-		echo "repository=https://alpha.de.repo.voidlinux.org/current/musl" > \
-			${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
-		;;
-	*)
-		echo "repository=https://alpha.de.repo.voidlinux.org/current" > \
-			${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
+		_suffix="/musl"
 		;;
 	esac
+
+	echo "${_repo}/current${_suffix}" > \
+		${DESTDIR}/usr/share/xbps.d/00-repository-main.conf
+	echo "architecture=${XBPS_TARGET_MACHINE}" > \
+		${DESTDIR}/usr/share/xbps.d/xbps-arch.conf
+
 	vlicense LICENSE
 	vlicense LICENSE.3RDPARTY
 }
@@ -58,6 +60,7 @@ libxbps_package() {
 		vmove "usr/lib/*.so.*"
 	}
 }
+
 libxbps-devel_package() {
 	short_desc+=" - runtime library (development files)"
 	depends="${makedepends} libxbps>=${version}_${revision}"