diff --git a/Makefile.inc1 b/Makefile.inc1
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1600,7 +1600,7 @@
 # because we may be building with a STRICTTMPPATH, so we explicitly include
 # /usr/libexec here for flua.  ${TMPPATH} still usefully includes anything else
 # we may need to function.
-_sysent_PATH=	${TMPPATH}:/usr/libexec
+_btflua_PATH=	${TMPPATH}:/usr/libexec
 _sysent_dirs=	sys/kern
 _sysent_dirs+=	sys/compat/freebsd32
 _sysent_dirs+=	sys/amd64/linux		\
@@ -1613,7 +1613,7 @@
 .for _dir in ${_sysent_dirs}
 sysent-${_dir}: .PHONY
 	@echo "${MAKE} -C ${.CURDIR}/${_dir} sysent"
-	${_+_}@env PATH=${_sysent_PATH:Q} ${MAKE} -C ${.CURDIR}/${_dir} sysent
+	${_+_}@env PATH=${_btflua_PATH:Q} ${MAKE} -C ${.CURDIR}/${_dir} sysent
 
 sysent: sysent-${_dir}
 .endfor
@@ -1989,6 +1989,9 @@
 PKG_ABI!=	${PKG_CMD} -o ABI_FILE=${PKG_ABI_FILE} config ABI
 .endif
 
+GENERATE_UCL=	\
+    env PATH=${_btflua_PATH:Q} flua ${SRCDIR}/release/packages/generate-ucl.lua
+
 .ORDER:		stage-packages create-packages
 .ORDER:		create-packages create-world-packages
 .ORDER:		create-packages create-source-packages
@@ -2149,7 +2152,7 @@
 		( echo "@override_prefix /usr/src" ;  \
 		${GIT_CMD} ls-files --recurse-submodules ":!:sys/" ) \
 		> ${SSTAGEDIR}/src.plist
-	${SRCDIR}/release/packages/generate-ucl.lua \
+	${GENERATE_UCL} \
 		PKGNAME "src" \
 		PKGGENNAME "src" \
 		VERSION "${PKG_VERSION}" \
@@ -2175,7 +2178,7 @@
 		( echo "@override_prefix /usr/src" ; \
 		${GIT_CMD} ls-files --recurse-submodules "sys/" ) \
 		> ${SSTAGEDIR}/src-sys.plist
-	${SRCDIR}/release/packages/generate-ucl.lua \
+	${GENERATE_UCL} \
 		PKGNAME "src-sys" \
 		PKGGENNAME "src-sys" \
 		VERSION "${PKG_VERSION}" \
@@ -2219,7 +2222,8 @@
 .for pkgname in ${_PKGS}
 create-world-packages-jobs: create-world-package-${pkgname}
 create-world-package-${pkgname}: .PHONY
-	@sh ${SRCDIR}/release/packages/generate-ucl.sh -o ${pkgname} \
+	@env PATH=${_btflua_PATH:Q} \
+		sh ${SRCDIR}/release/packages/generate-ucl.sh -o ${pkgname} \
 		-s ${SRCDIR} -u ${WSTAGEDIR}/${pkgname}.ucl
 	@awk -F\" ' \
 		/^name/ { printf("===> Creating %s-", $$2); next } \
@@ -2263,7 +2267,7 @@
 
 create-dtb-package:
 	@if [ -f ${KSTAGEDIR}/${DISTDIR}/dtb.plist ]; then \
-	${SRCDIR}/release/packages/generate-ucl.lua \
+	${GENERATE_UCL} \
 		PKGNAME "dtb" \
 		PKGGENNAME "dtb" \
 		VERSION "${PKG_VERSION}" \
@@ -2294,7 +2298,7 @@
 	${METALOG_SORT_CMD} ${KSTAGEDIR}/kernel.meta | \
 	awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
 		-v kernel=yes -v _kernconf=${INSTALLKERNEL} ; \
-	${SRCDIR}/release/packages/generate-ucl.lua \
+	${GENERATE_UCL} \
 		PKGNAME "kernel-${INSTALLKERNEL:tl}${flavor}" \
 		PKGGENNAME "kernel" \
 		VERSION "${PKG_VERSION}" \
@@ -2336,7 +2340,7 @@
 	${METALOG_SORT_CMD} ${KSTAGEDIR}/kernel.${_kernel}.meta | \
 	awk -f ${SRCDIR}/release/scripts/mtree-to-plist.awk \
 		-v kernel=yes -v _kernconf=${_kernel} ; \
-	${SRCDIR}/release/packages/generate-ucl.lua \
+	${GENERATE_UCL} \
 		PKGNAME "kernel-${_kernel:tl}${flavor}" \
 		PKGGENNAME "kernel" \
 		FORCEINCLUDE "kernel${flavor}" \
diff --git a/release/packages/generate-ucl.sh b/release/packages/generate-ucl.sh
--- a/release/packages/generate-ucl.sh
+++ b/release/packages/generate-ucl.sh
@@ -82,7 +82,8 @@
 	fi
 
 	cap_arg="$( make -f ${srctree}/share/mk/bsd.endian.mk -VCAP_MKDB_ENDIAN )"
-	${srctree}/release/packages/generate-ucl.lua \
+	# Makefile.inc1 should position flua in PATH for us
+	flua ${srctree}/release/packages/generate-ucl.lua \
 		VERSION "${PKG_VERSION}" \
 		PKGNAME "${origname}" \
 		PKGGENNAME "${outname}" \