diff --git a/common/xbps-src/libexec/xbps-src-doinstall.sh b/common/xbps-src/libexec/xbps-src-doinstall.sh
index b3d5d7276f..af30e5ae5e 100755
--- a/common/xbps-src/libexec/xbps-src-doinstall.sh
+++ b/common/xbps-src/libexec/xbps-src-doinstall.sh
@@ -53,6 +53,14 @@ if [ ! -f $XBPS_SUBPKG_INSTALL_DONE ]; then
 
         ${PKGNAME}_package
         pkgname=$PKGNAME
+        if [ -n "$noarch" ]; then
+            archs=noarch
+            unset noarch
+        fi
+        if [ -n "$only_for_archs" ]; then
+            archs="$only_for_archs"
+            unset only_for_archs
+        fi
 
         source_file $XBPS_COMMONDIR/environment/build-style/${build_style}.sh
 
diff --git a/common/xbps-src/libexec/xbps-src-prepkg.sh b/common/xbps-src/libexec/xbps-src-prepkg.sh
index 4be45fd0a1..abc8988ec4 100755
--- a/common/xbps-src/libexec/xbps-src-prepkg.sh
+++ b/common/xbps-src/libexec/xbps-src-prepkg.sh
@@ -40,6 +40,14 @@ if [ "$sourcepkg" != "$PKGNAME" ]; then
 
     ${PKGNAME}_package
     pkgname=$PKGNAME
+    if [ -n "$noarch" ]; then
+        archs=noarch
+        unset noarch
+    fi
+    if [ -n "$only_for_archs" ]; then
+        archs="$only_for_archs"
+        unset only_for_archs
+    fi
 fi
 
 source_file $XBPS_COMMONDIR/environment/build-style/${build_style}.sh