diff --git a/Makefile.inc1 b/Makefile.inc1
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1677,15 +1677,33 @@
 KERNCONF=${KERNFAST}
 .endif
 .endif
+.if defined(PACKAGE_BUILDING)
 .if ${TARGET_ARCH} == "powerpc64"
 KERNCONF?=	GENERIC64
 .elif ${TARGET_ARCH} == "powerpc64le"
 KERNCONF?=	GENERIC64LE
 .elif ${TARGET_ARCH} == "powerpcspe"
 KERNCONF?=	MPC85XXSPE
+.elif ${TARGET_ARCH} == "amd64"
+KERNCONF?=	GENERIC GENERIC-NODEBUG MINIMAL GENERIC-MMCCAM
+.elif ${ARCH} == "arm" || ${ARCH} == "arm64"
+KERNCONF?=	GENERIC GENERIC-NODEBUG GENERIC-MMCCAM
+.elif ${TARGET_ARCH} == "i386"
+KERNCONF?=	GENERIC GENERIC-NODEBUG MINIMAL
 .else
 KERNCONF?=	GENERIC
 .endif
+.else
+.if ${TARGET_ARCH} == "powerpc64"
+KERNCONF?=	GENERIC64
+.elif ${TARGET_ARCH} == "powerpc64le"
+KERNCONF?=	GENERIC64LE
+.elif ${TARGET_ARCH} == "powerpcspe"
+KERNCONF?=	MPC85XXSPE
+.else
+KERNCONF?=	GENERIC
+.endif
+.endif
 INSTKERNNAME?=	kernel
 
 KERNSRCDIR?=	${.CURDIR}/sys