diff --git a/Makefile b/Makefile
index e56a7a767808..320f2590a0c6 100644
--- a/Makefile
+++ b/Makefile
@@ -126,8 +126,9 @@ TGTS=	all all-man buildenv buildenvvars buildkernel buildworld \
 	_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
 	_build-tools _cross-tools _includes _libraries _depend \
 	build32 builddtb distribute32 install32 xdev xdev-build xdev-install \
-	xdev-links native-xtools create-kernel-packages stageworld stagekernel \
-	create-world-packages packages installconfig signpackages
+	xdev-links native-xtools stageworld stagekernel stage-packages \
+	create-world-packages create-kernel-packages create-packages \
+	packages installconfig signpackages
 
 TGTS+=	${SUBDIR_TARGETS}
 
diff --git a/Makefile.inc1 b/Makefile.inc1
index 99f9798762be..40285dd5963b 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1374,11 +1374,17 @@ _pkgbootstrap:
 	@env ASSUME_ALWAYS_YES=YES pkg bootstrap
 .endif
 
-packages:	_pkgbootstrap
-	@mkdir -p ${WSTAGEDIR} ${KSTAGEDIR} ${REPODIR}
+packages:	stage-packages create-packages
+
+stage-packages:
+	@mkdir -p ${WSTAGEDIR} ${KSTAGEDIR}
 	${_+_}@cd ${.CURDIR}; \
 		${MAKE} DESTDIR=${DESTDIR:U${WSTAGEDIR}} -DNO_ROOT -B stageworld ; \
-		${MAKE} DESTDIR=${DESTDIR:U${KSTAGEDIR}} -DNO_ROOT -B stagekernel ; \
+		${MAKE} DESTDIR=${DESTDIR:U${KSTAGEDIR}} -DNO_ROOT -B stagekernel
+
+create-packages:	_pkgbootstrap
+	@mkdir -p ${REPODIR}
+	${_+_}@cd ${.CURDIR}; \
 		${MAKE} DESTDIR=${DESTDIR:U${WSTAGEDIR}} \
 			PKG_VERSION=${PKG_VERSION} create-world-packages ; \
 		${MAKE} DESTDIR=${DESTDIR:U${KSTAGEDIR}} \