diff --git a/Makefile.inc1 b/Makefile.inc1
index d41741d1538..65149beb9eb 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -2047,6 +2047,7 @@ update-packages: .PHONY
 	${_+_}${MAKE} -C ${.CURDIR} ${PKGMAKEARGS} real-update-packages
 
 package-pkg: _pkgbootstrap _repodir .PHONY
+.if defined(INCLUDE_PKG_IN_PKGBASE_REPO)
 .if exists(${PORTSDIR})
 	rm -rf /tmp/ports.${TARGET} || :
 	env ${WMAKEENV} SRCDIR=${.CURDIR} PORTSDIR=${PORTSDIR} REVISION=${_REVISION} \
@@ -2055,6 +2056,7 @@ package-pkg: _pkgbootstrap _repodir .PHONY
 		OSVERSION="${SRCRELDATE}" \
 		sh ${.CURDIR}/release/scripts/make-pkg-package.sh
 .endif
+.endif
 
 real-packages:	stage-packages create-packages sign-packages .PHONY
 
diff --git a/release/Makefile b/release/Makefile
index bc04a797474..40eea0e24a7 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -195,7 +195,8 @@ PKG_ABI=	$$(${PKG_CMD} -o ABI_FILE=${.TARGET}/usr/bin/uname config ABI)
 
 pkgbase-repo:
 	mkdir -p pkgbase-repo
-	( ${IMAKE} -C ${WORLDDIR} packages REPODIR=${.OBJDIR}/pkgbase-repo )
+	( ${IMAKE} -C ${WORLDDIR} packages REPODIR=${.OBJDIR}/pkgbase-repo \
+	    INCLUDE_PKG_IN_PKGBASE_REPO=YES )
 
 disc1: ${PKGBASE_REPO}
 # Install system