diff --git a/xbps-src b/xbps-src
index a2228650aa3..653efe87491 100755
--- a/xbps-src
+++ b/xbps-src
@@ -369,6 +369,13 @@ fi
 #
 check_config_vars
 
+if [ -n "$XBPS_HOSTDIR" ]; then
+	export XBPS_REPOSITORY=$XBPS_HOSTDIR/binpkgs
+	readonly XBPS_SRCDISTDIR=$XBPS_HOSTDIR/sources
+else
+	export XBPS_REPOSITORY=$XBPS_MASTERDIR/host/binpkgs
+	readonly XBPS_SRCDISTDIR=$XBPS_MASTERDIR/host/sources
+fi
 if [ -n "$IN_CHROOT" ]; then
 	readonly XBPS_UHELPER_CMD="xbps-uhelper"
 	readonly XBPS_INSTALL_CMD="xbps-install"
@@ -384,13 +391,6 @@ else
 	readonly XBPS_RECONFIGURE_CMD="xbps-reconfigure -r $XBPS_MASTERDIR"
 	readonly XBPS_REMOVE_CMD="xbps-remove -r $XBPS_MASTERDIR"
 fi
-if [ -n "$XBPS_HOSTDIR" ]; then
-	export XBPS_REPOSITORY=$XBPS_HOSTDIR/binpkgs
-	readonly XBPS_SRCDISTDIR=$XBPS_HOSTDIR/sources
-else
-	export XBPS_REPOSITORY=$XBPS_MASTERDIR/host/binpkgs
-	readonly XBPS_SRCDISTDIR=$XBPS_MASTERDIR/host/sources
-fi
 readonly XBPS_SRCPKGDIR=$XBPS_DISTDIR/srcpkgs
 readonly XBPS_COMMONDIR=$XBPS_DISTDIR/common
 readonly XBPS_SHUTILSDIR=$XBPS_COMMONDIR/xbps-src/shutils