diff --git a/Makefile b/Makefile
index 540d1834faa6..76e318019b53 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ TGTS=	all all-man buildkernel buildworld checkdpadd clean \
 	cleandepend cleandir depend distribute distributeworld everything \
 	hierarchy install installcheck installkernel installkernel.debug\
 	reinstallkernel reinstallkernel.debug installworld \
-	libraries lint maninstall \
+	kernel-toolchain libraries lint maninstall \
 	obj objlink regress rerelease tags toolchain update \
 	_worldtmp _legacy _bootstrap-tools _cleanobj _obj \
 	_build-tools _cross-tools _includes _libraries _depend
diff --git a/Makefile.inc1 b/Makefile.inc1
index 6aca0340996b..90719e0da6de 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -343,7 +343,9 @@ WMAKE_TGTS+=	_includes _libraries _depend everything
 buildworld: ${WMAKE_TGTS}
 .ORDER: ${WMAKE_TGTS}
 
-toolchain: ${WMAKE_TGTS:N_depend:Neverything}
+TOOLCHAIN_TGTS=	${WMAKE_TGTS:N_depend:Neverything}
+toolchain: ${TOOLCHAIN_TGTS}
+kernel-toolchain: ${TOOLCHAIN_TGTS:N_includes:N_libraries}
 
 #
 # Use this to add checks to installworld/installkernel targets.