diff --git a/math/gmp/Makefile b/math/gmp/Makefile
--- a/math/gmp/Makefile
+++ b/math/gmp/Makefile
@@ -9,7 +9,7 @@
 
 LICENSE=	LGPL3
 
-USES=		cpe libtool makeinfo tar:xz
+USES=		cpe libtool tar:xz
 
 CPE_VENDOR=	gmplib
 
@@ -17,7 +17,6 @@
 CPU_OPTS_DESC=	Enable assembly optimizations for your CPU
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--infodir=${PREFIX}/${INFO_PATH} \
 		--mandir=${PREFIX}/man \
@@ -25,11 +24,17 @@
 
 USE_LDCONFIG=	yes
 
-INFO=		gmp
-
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
+OPTIONS_DEFINE=		INFO
+OPTIONS_DEFAULT=	INFO
+
+INFO_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-no-info
+INFO_CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
+INFO_INFO=		gmp
+INFO_USES=		makeinfo
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH:Mmips*}
diff --git a/math/gmp/files/extra-patch-no-info b/math/gmp/files/extra-patch-no-info
--- a/math/gmp/files/extra-patch-no-info
+++ b/math/gmp/files/extra-patch-no-info
@@ -0,0 +1,8 @@
+--- Makefile.in.orig	2020-11-14 21:45:16.000000000 +0300
++++ Makefile.in	2022-10-16 13:04:07.996246000 +0300
+@@ -575,4 +575,4 @@
+-SUBDIRS = tests mpn mpz mpq mpf printf scanf rand cxx demos tune doc
++SUBDIRS = tests mpn mpz mpq mpf printf scanf rand cxx demos tune
+ 
+ # Put asl.h here for now.
+ 
diff --git a/math/mpfr/Makefile b/math/mpfr/Makefile
--- a/math/mpfr/Makefile
+++ b/math/mpfr/Makefile
@@ -21,17 +21,20 @@
 PATCHLEVEL=	13
 PATCHFILES!=	/usr/bin/jot -s " " -w patch%02d ${PATCHLEVEL} 1 ${PATCHLEVEL}
 
-USES=		gmake libtool makeinfo tar:xz
+USES=		gmake libtool tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gmp=${LOCALBASE}
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 USE_LDCONFIG=	yes
 
-INFO=		mpfr
-
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS INFO
+OPTIONS_DEFAULT=	INFO
+
+INFO_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-no-info
+INFO_INFO=		mpfr
+INFO_USES=		makeinfo
 
 .include <bsd.port.mk>
diff --git a/math/mpfr/files/extra-patch-no-info b/math/mpfr/files/extra-patch-no-info
--- a/math/mpfr/files/extra-patch-no-info
+++ b/math/mpfr/files/extra-patch-no-info
@@ -0,0 +1,20 @@
+--- doc/Makefile.in.orig	2020-07-10 14:59:02.000000000 +0300
++++ doc/Makefile.in	2022-10-16 13:51:10.556330000 +0300
+@@ -582,7 +582,7 @@
+ 	  dist-info
+ check-am: all-am
+ check: check-am
+-all-am: Makefile $(INFO_DEPS) $(DATA)
++all-am: Makefile $(DATA)
+ installdirs:
+ 	for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(docdir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+@@ -637,7 +637,7 @@
+ 
+ info-am: $(INFO_DEPS)
+ 
+-install-data-am: install-dist_docDATA install-info-am
++install-data-am: install-dist_docDATA
+ 
+ install-dvi: install-dvi-am
+