Index: Makefile.inc1
===================================================================
--- Makefile.inc1	(revision 276497)
+++ Makefile.inc1	(working copy)
@@ -247,7 +247,8 @@
 		SSP_CFLAGS= \
 		-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
 		-DNO_PIC -DNO_PROFILE -DNO_SHARED \
-		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD -DNO_TESTS
+		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD -DNO_TESTS \
+		-D_BOOTSTRAP_MAKEINFO=${MK_INFO}

 # build-tools stage
 TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
@@ -1299,6 +1300,11 @@
 _dtc= gnu/usr.bin/dtc
 .endif

+.if ${_BOOTSTRAP_MAKEINFO} != "no"
+_texinfo=	gnu/usr.bin/texinfo/libtxi \
+		gnu/usr.bin/texinfo/makeinfo
+.endif
+
 .if ${MK_KERBEROS} != "no"
 _kerberos5_bootstrap_tools= \
 	kerberos5/tools/make-roken \
@@ -1338,6 +1344,7 @@
     usr.sbin/config \
     ${_crunch} \
     ${_nmtree} \
+    ${_texinfo} \
     ${_vtfontcvt}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool} && \