diff --git a/stand/Makefile b/stand/Makefile
index 1597f6832c07..4d241c623d97 100644
--- a/stand/Makefile
+++ b/stand/Makefile
@@ -1,96 +1,101 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 # For amd64 we have to build 32 and 64 bit versions of things. For
 # others we don't. LIB32LIST is a list of libraries, which if
 # included, need to be built 32-bit as well.
 .if ${MACHINE_ARCH} == "amd64"
 LIB32LIST=libsa
 .if ${MK_FORTH} != "no"
 LIB32LIST+=		ficl
 .endif
 .if ${MK_LOADER_LUA} != "no"
 LIB32LIST+=		liblua
 .endif
 .endif
 
 S.yes+=			libsa
 
 S.${MK_LOADER_OFW}+=	libofw
 S.${MK_FDT}+=		fdt
 
 S.${MK_FORTH}+=		ficl
 S.${MK_FORTH}+=		forth
 S.${MK_LOADER_LUA}+=	liblua
 S.${MK_LOADER_LUA}+=	lua
 S.yes+=			defaults
 S.yes+=			fonts
 S.yes+=			images
 S.yes+=			man
 
 .if ${MK_FORTH} != "no"
 INTERP_DEPENDS+=	forth
 .endif
 .if ${MK_LOADER_LUA} != "no"
 INTERP_DEPENDS+=	lua
 .endif
 
 .include <bsd.arch.inc.mk>
 
 S.${MK_EFI}+=		efi
 .if ${MK_FDT} != "no"
 S.${MK_LOADER_KBOOT}+=	kboot
 .endif
 S.${MK_LOADER_UBOOT}+=	uboot
 
 .if defined(LIB32LIST)
 LIB32DEPENDS=	${LIB32LIST:S/$/32/}
 .endif
 
 .if exists(${.CURDIR}/${MACHINE}/.)
 S.yes+=         ${MACHINE}
 SUBDIR_DEPEND_${MACHINE}+=	${INTERP_DEPENDS}
 .if ${MK_FDT} != "no"
 SUBDIR_DEPEND_${MACHINE}+=	fdt
 .endif
 .if ${MK_LOADER_UBOOT} != "no"
 SUBDIR_DEPEND_${MACHINE}+=	uboot
 .endif
 .if ${MK_LOADER_OFW} != "no"
 SUBDIR_DEPEND_${MACHINE}+=	libofw
 .endif
 .endif
 
 # Build the actual subdir list from S.yes, adding in the 32-bit
 # variant if necessary.
 .for _x in ${S.yes}
 SUBDIR+=${_x}
 .if defined(LIB32LIST) && ${LIB32LIST:M${_x}}
 SUBDIR+=${_x}32
 .endif
 .if ${_x} != "libsa"
 SUBDIR_DEPEND_${_x}+=	libsa
 SUBDIR_DEPEND_${_x}32+=	libsa32
 .endif
 .endfor
 
 # Remaining dependencies
 SUBDIR_DEPEND_forth+=	ficl
 SUBDIR_DEPEND_lua+=	liblua
 
 SUBDIR_DEPEND_efi+=	${INTERP_DEPENDS}
 SUBDIR_DEPEND_kboot+=	${INTERP_DEPENDS}
 .if ${MK_FDT} != "no"
 SUBDIR_DEPEND_efi+=	fdt
 SUBDIR_DEPEND_kboot+=	fdt
 .endif
 
 SUBDIR_DEPEND_uboot+=	${INTERP_DEPENDS}
 .if ${MK_FDT} != "no"
 SUBDIR_DEPEND_uboot+=	fdt
 .endif
 
 SUBDIR_PARALLEL=	yes
 
 .include <bsd.subdir.mk>
+
+# Simplified way to build-test the most important build combinations for the
+# loader.
+universe:
+	sh ${SRCTOP}/tools/boot/universe.sh