Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -249,6 +249,8 @@
 CROSSENV+=	${TARGET_CFLAGS}
 .endif
 
+MK_INFO_SUPPORT?=	${MK_INFO}
+
 # bootstrap-tools stage
 BMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		PATH=${BPATH}:${PATH} \
@@ -264,7 +266,7 @@
 		-DNO_PIC MK_PROFILE=no -DNO_SHARED \
 		-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
 		MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
-		MK_LLDB=no MK_TESTS=no
+		MK_INFO_SUPPORT=${MK_INFO_SUPPORT} MK_LLDB=no MK_TESTS=no
 
 # build-tools stage
 TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
@@ -1307,6 +1309,11 @@
 _dtc= gnu/usr.bin/dtc
 .endif
 
+.if ${MK_INFO_SUPPORT} == "yes"
+_texinfo=	gnu/usr.bin/texinfo/libtxi \
+		gnu/usr.bin/texinfo/makeinfo
+.endif
+
 .if ${MK_KERBEROS} != "no"
 _kerberos5_bootstrap_tools= \
 	kerberos5/tools/make-roken \
@@ -1344,6 +1351,7 @@
     usr.sbin/config \
     ${_crunch} \
     ${_nmtree} \
+    ${_texinfo} \
     ${_vtfontcvt}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool} && \