diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index b81572d62abf..8369784e465b 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -1,43 +1,46 @@
 # Created by: mr
 
 PORTNAME=	m4
 PORTVERSION=	1.4.19
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	GNU M4
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cpe iconv makeinfo tar:xz
+USES=		cpe iconv tar:xz
 
 CONFIGURE_ARGS=	--program-prefix=g
-CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
 GNU_CONFIGURE=	yes
 
 EXAMPLESDIR=	${PREFIX}/share/examples/gm4
-INFO=		m4
 
 CPE_VENDOR=	gnu
 
-OPTIONS_DEFINE=	EXAMPLES LIBSIGSEGV NLS
+OPTIONS_DEFINE=	EXAMPLES INFO LIBSIGSEGV NLS
+OPTIONS_DEFAULT=INFO
 OPTIONS_SUB=	yes
 LIBSIGSEGV_DESC=Use alternative page fault handler (GNU libsigsegv)
 
+INFO_CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
+INFO_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-no-info
+INFO_INFO=		m4
+INFO_USES=		makeinfo
 LIBSIGSEGV_CONFIGURE_WITH=	libsigsegv-prefix=${LOCALBASE}
 LIBSIGSEGV_LIB_DEPENDS=	libsigsegv.so:devel/libsigsegv
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^* M4: / s|M4|G&|' ${WRKSRC}/doc/m4.texi
 	@${REINPLACE_CMD} -e '/^install-exec-am: / s| .*||' ${WRKSRC}/lib/Makefile.in
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
 	${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${STAGEDIR}${EXAMPLESDIR}/
 
 .include <bsd.port.mk>
diff --git a/devel/m4/files/extra-patch-no-info b/devel/m4/files/extra-patch-no-info
new file mode 100644
index 000000000000..7be833cf2c47
--- /dev/null
+++ b/devel/m4/files/extra-patch-no-info
@@ -0,0 +1,20 @@
+--- doc/Makefile.in.orig	2021-05-28 18:48:48 UTC
++++ doc/Makefile.in
+@@ -2223,7 +2223,7 @@ distdir-am: $(DISTFILES)
+ 	  dist-info
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(INFO_DEPS) $(MANS)
++all-am: Makefile $(MANS)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+@@ -2279,7 +2279,7 @@ info: info-am
+ 
+ info-am: $(INFO_DEPS)
+ 
+-install-data-am: install-info-am install-man
++install-data-am: install-man
+ 
+ install-dvi: install-dvi-am
+