diff --git a/Makefile.inc1 b/Makefile.inc1
index 77f3ca01237d..19d2bb1ac35b 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1364,8 +1364,8 @@ packagekernel:
 stagekernel:
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} distributekernel
 
-WSTAGEDIR=	${MAKEOBJDIRPREFIX}${.CURDIR}/worldstage
-KSTAGEDIR=	${MAKEOBJDIRPREFIX}${.CURDIR}/kernelstage
+WSTAGEDIR=	${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/worldstage
+KSTAGEDIR=	${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/kernelstage
 REPODIR=	${MAKEOBJDIRPREFIX}${.CURDIR}/repo
 PKGSIGNKEY?=	# empty