diff --git a/tools/Makefile b/tools/Makefile
index ab3848d3ebc2..7dce46751888 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.165 2012/12/02 12:25:25 apb Exp $
+#	$NetBSD: Makefile,v 1.166 2013/01/31 15:22:50 pooka Exp $
 
 .include <bsd.own.mk>
 
@@ -17,6 +17,12 @@
 .endif
 .endif # MKTOOLS != no
 
+# TOOLS_BUILDRUMP == yes builds only the subset of the tools required
+# for building rump kernels and the hypervisor.  It is typically used
+# when building rump kernels targeted for non-NetBSD systems (via
+# buildrump.sh), and should not be set for a regular "make build".
+TOOLS_BUILDRUMP?=no
+
 .if ${TOOLCHAIN_MISSING} == "no"
 .if defined(HAVE_GCC)
 TOOLCHAIN_BITS= gmake .WAIT
@@ -91,20 +97,22 @@ dependall-binstall: dependall-compat
 # See above for special treatment for host-mkdep, compat, and binstall.
 #
 SUBDIR=	host-mkdep compat binstall \
-	.WAIT mktemp .WAIT sed .WAIT \
-		cap_mkdb crunchgen ctags genassym gencat hexdump join \
+	.WAIT mktemp .WAIT sed .WAIT
+.if ${TOOLS_BUILDRUMP} == "no"
+SUBDIR+= cap_mkdb crunchgen ctags genassym gencat hexdump \
 		${LINT_BITS} \
-		lorder makewhatis mkdep mtree nbperf .WAIT rpcgen tsort \
-		uudecode m4 \
-	.WAIT texinfo \
-	.WAIT yacc \
-	.WAIT awk \
+		makewhatis mtree nbperf .WAIT rpcgen uudecode
+.endif
+
+SUBDIR+= join lorder m4 mkdep tsort .WAIT yacc .WAIT awk .WAIT lex
+
+.if ${TOOLS_BUILDRUMP} == "no"
+SUBDIR += .WAIT texinfo \
 	.WAIT tic \
-	.WAIT lex \
 	.WAIT pax \
 	.WAIT ${TOOLCHAIN_BITS} \
 	${DTRACE_BITS} \
-		asn1_compile cat cksum compile_et config db \
+		asn1_compile cat cksum compile_et db \
 		file lint1 slc \
 		makefs .WAIT menuc mkcsmapper mkesdb mklocale mknod msgc \
 		.WAIT disklabel \
@@ -112,6 +120,8 @@ SUBDIR=	host-mkdep compat binstall \
 		.WAIT fdisk \
 		.WAIT installboot \
 		pwd_mkdb stat strfile sunlabel zic
+.endif
+SUBDIR+= .WAIT config
 
 .if ${MKLLVM} != "no"
 SUBDIR+= \
@@ -130,6 +140,8 @@ SUBDIR+=	groff
 SUBDIR+=	mandoc
 .endif
 
+.if ${TOOLS_BUILDRUMP} == "no"
+
 .if ${MKMAINTAINERTOOLS:Uno} != "no"
 SUBDIR+=	autoconf .WAIT gettext
 .endif
@@ -193,6 +205,8 @@ SUBDIR+=	elftosb
 SUBDIR+=	mkubootimage
 .endif
 
+.endif # TOOLCHAIN_BUILDRUMP
+
 check_MKTOOLS: .PHONY .NOTMAIN
 .if ${MKTOOLS:Uyes} == "no"
 	@echo '*** WARNING: "MKTOOLS" is set to "no"; this will prevent building and'