diff --git a/Makefile.inc1 b/Makefile.inc1
index 65149beb9eb6..6744a25965c6 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1992,7 +1992,7 @@ PKG_ABI!=	${PKG_CMD} -o ABI_FILE=${PKG_ABI_FILE} config ABI
 
 _pkgbootstrap: .PHONY
 .if make(*package*) && !exists(${LOCALBASE}/sbin/pkg)
-.if exists(${PORTSDIR}/ports-mgmt/pkg/Makefile)
+.if defined(BOOTSTRAP_PKG_FROM_PORTS)
 	env - UNAME_r=${UNAME_r} PATH=$$PATH \
 	    make -C ${PORTSDIR}/ports-mgmt/pkg \
 	    I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE=1 \
diff --git a/release/Makefile b/release/Makefile
index 40eea0e24a70..b4da9c68eca1 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -195,8 +195,9 @@ PKG_ABI=	$$(${PKG_CMD} -o ABI_FILE=${.TARGET}/usr/bin/uname config ABI)
 
 pkgbase-repo:
 	mkdir -p pkgbase-repo
+	mkdir -p /tmp/ports /tmp/distfiles
 	( ${IMAKE} -C ${WORLDDIR} packages REPODIR=${.OBJDIR}/pkgbase-repo \
-	    INCLUDE_PKG_IN_PKGBASE_REPO=YES )
+	    INCLUDE_PKG_IN_PKGBASE_REPO=YES BOOTSTRAP_PKG_FROM_PORTS=YES )
 
 disc1: ${PKGBASE_REPO}
 # Install system