diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh
index 9493fc5d..08da4c88 100755
--- a/src/share/poudriere/common.sh
+++ b/src/share/poudriere/common.sh
@@ -6386,7 +6386,7 @@ port_var_fetch() {
 			shiftcnt=$((shiftcnt + 1))
 		fi
 	done <<-EOF
-	$(IFS="${sep}"; injail /usr/bin/make ${_make_origin} ${_makeflags-} ||
+	$(IFS="${sep}"; ${MASTERNAME+injail} /usr/bin/make ${_make_origin} ${_makeflags-} ||
 	    echo "${_errexit} $?")
 	EOF
 
diff --git a/src/share/poudriere/options.sh b/src/share/poudriere/options.sh
index d0cf636c..2dfaa867 100755
--- a/src/share/poudriere/options.sh
+++ b/src/share/poudriere/options.sh
@@ -181,6 +181,7 @@ if [ "${OFLAG}" -eq 0 ] &&
 	fi
 fi
 
+fetch_global_port_vars
 mkdir -p "${PORT_DBDIR}"
 msg "Working on options directory: ${PORT_DBDIR}"
 msg "Using ports from: ${PORTSDIR}"