Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -264,7 +264,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} MK_LLDB=no MK_TESTS=no
 
 # build-tools stage
 TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
@@ -1310,6 +1310,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 \
@@ -1347,6 +1352,7 @@
     usr.sbin/config \
     ${_crunch} \
     ${_nmtree} \
+    ${_texinfo} \
     ${_vtfontcvt}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool} && \
@@ -1367,11 +1373,6 @@
 _gcc_tools= gnu/usr.bin/cc/cc_tools
 .endif
 
-.if ${MK_INFO} != "no"
-_texinfo=	gnu/usr.bin/texinfo/libtxi \
-		gnu/usr.bin/texinfo/makeinfo
-.endif
-
 .if ${MK_RESCUE} != "no"
 _rescue= rescue/rescue
 .endif
@@ -1403,15 +1404,6 @@
 		${MAKE} DIRPRFX=${_tool}/ depend && \
 		${MAKE} DIRPRFX=${_tool}/ all
 .endfor
-.for _tool in \
-    ${_texinfo}
-	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
-		cd ${.CURDIR}/${_tool} && \
-		${MAKE} DIRPRFX=${_tool}/ obj && \
-		${MAKE} DIRPRFX=${_tool}/ depend && \
-		${MAKE} DIRPRFX=${_tool}/ all && \
-		${MAKE} DIRPRFX=${_tool}/ install DESTDIR=${WORLDTMP}
-.endfor
 
 
 #
Index: gnu/usr.bin/Makefile
===================================================================
--- gnu/usr.bin/Makefile
+++ gnu/usr.bin/Makefile
@@ -30,7 +30,7 @@
 _dtc=		dtc
 .endif
 
-.if ${MK_INFO} != "no"
+.if ${MK_INFO_SUPPORT} != "no"
 _texinfo=	texinfo
 .endif
 
Index: share/mk/src.opts.mk
===================================================================
--- share/mk/src.opts.mk
+++ share/mk/src.opts.mk
@@ -330,6 +330,7 @@
     GNU \
     INET \
     INET6 \
+    INFO \
     KERBEROS \
     KVM \
     NETGRAPH \
Index: tools/build/options/WITH_INFO_SUPPORT
===================================================================
--- /dev/null
+++ tools/build/options/WITH_INFO_SUPPORT
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to build
+.Xr texinfo 1
+and associated utilities.