diff --git a/Makefile.inc1 b/Makefile.inc1
index 8244721238b9..1917c6ed289c 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1548,15 +1548,22 @@ stage-packages-kernel: .PHONY
 
 stage-packages: .PHONY stage-packages-world stage-packages-kernel
 
-create-packages:	_pkgbootstrap .PHONY
+_repodir: .PHONY
 	@mkdir -p ${REPODIR}
+
+create-packages-world:	_pkgbootstrap _repodir .PHONY
 	${_+_}@cd ${.CURDIR}; \
 		${MAKE} DESTDIR=${WSTAGEDIR} \
-			PKG_VERSION=${PKG_VERSION} create-world-packages ; \
+			PKG_VERSION=${PKG_VERSION} create-world-packages
+
+create-packages-kernel:	_pkgbootstrap _repodir .PHONY
+	${_+_}@cd ${.CURDIR}; \
 		${MAKE} DESTDIR=${KSTAGEDIR} \
 			PKG_VERSION=${PKG_VERSION} DISTDIR=kernel \
 			create-kernel-packages
 
+create-packages: .PHONY create-packages-world create-packages-kernel
+
 create-world-packages:	_pkgbootstrap .PHONY
 	@rm -f ${WSTAGEDIR}/*.plist 2>/dev/null || :
 	@cd ${WSTAGEDIR} ; \