diff --git a/xbstrap/__init__.py b/xbstrap/__init__.py
index cb49c87..2bd3d27 100755
--- a/xbstrap/__init__.py
+++ b/xbstrap/__init__.py
@@ -943,7 +943,7 @@ def do_prereqs(args):
                     tar.extract(info, scripts_dir)
     if "xbps" in comps:
         url = "https://repo-default.voidlinux.org/static"
-        url += "/xbps-static-static-0.59.2_1.x86_64-musl.tar.xz"
+        url += "/xbps-static-static-0.60.4_1.x86_64-musl.tar.xz"
         tar_path = os.path.join(home, "xbps.tar.xz")
 
         _util.log_info(f"Downloading xbps from {url}")
diff --git a/xbstrap/base.py b/xbstrap/base.py
index dd02e7d..92e861a 100644
--- a/xbstrap/base.py
+++ b/xbstrap/base.py
@@ -3385,6 +3385,7 @@ def pack_pkg(cfg, pkg, reproduce=False):
                     environ, "PATH", prepend=[os.path.join(_util.find_home(), "bin")]
                 )
                 environ["XBPS_ARCH"] = arch
+                environ["XBPS_TARGET_ARCH"] = arch
 
                 _util.log_info("Running {} ({})".format(args, arch))
                 subprocess.call(args, env=environ, stdout=output)