diff --git a/common/environment/configure/pkg-config.sh b/common/environment/configure/pkg-config.sh
index 88510caef6e..288e2620eb6 100644
--- a/common/environment/configure/pkg-config.sh
+++ b/common/environment/configure/pkg-config.sh
@@ -1,9 +1,8 @@
 # This snippet setups pkg-config vars.
 
-set -a
-
 if [ -z "$CHROOT_READY" ]; then
-	PKG_CONFIG_PATH="${XBPS_MASTERDIR}/usr/lib/pkgconfig:${XBPS_MASTERDIR}/usr/share/pkgconfig"
+	export PKG_CONFIG_PATH="${XBPS_MASTERDIR}/usr/lib/pkgconfig:${XBPS_MASTERDIR}/usr/share/pkgconfig"
+fi
+if [ -n "$CROSS_BUILD" ]; then
+	export PKG_CONFIG="${XBPS_CROSS_TRIPLET}-pkg-config"
 fi
-
-set +a