diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index 967ce24dbe81..38d3efb710ea 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -1,58 +1,61 @@
 PORTNAME=	libgcrypt
 DISTVERSION=	1.9.4
 CATEGORIES=	security
 MASTER_SITES=	GNUPG
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	General purpose cryptographic library based on the code from GnuPG
 
 LICENSE=	GPLv2+ LGPL21+
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	libgpg-error>=1.32:security/libgpg-error
 RUN_DEPENDS=	libgpg-error>=1.32:security/libgpg-error
 
-USES=		cpe libtool makeinfo tar:bzip2
+USES=		cpe libtool tar:bzip2
 
 CPE_VENDOR=	gnupg
 USE_CSTD=	gnu89
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-drng-support
-CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
 CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
 USE_LDCONFIG=	yes
 TEST_TARGET=	check
 
 DOCS=		AUTHORS ChangeLog ChangeLog-2011 INSTALL NEWS THANKS TODO \
 		doc/HACKING doc/README.apichanges
-INFO=		gcrypt
 PORTDOCS=	*
 
-OPTIONS_DEFINE=		DOCS STATIC
-OPTIONS_DEFAULT=	DOCS STATIC
+OPTIONS_DEFINE=		DOCS INFO STATIC
+OPTIONS_DEFAULT=	DOCS INFO STATIC
 OPTIONS_SUB=	yes
 
+INFO_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-no-info
+INFO_CONFIGURE_ENV=	MAKEINFO="${MAKEINFO} --no-split"
+INFO_INFO=		gcrypt
+INFO_USES=	makeinfo
+
 STATIC_CONFIGURE_ENABLE=	static
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "powerpc"
 CONFIGURE_ARGS+=	--disable-asm
 .endif
 
 .if ${ARCH} == "armv6" || ${ARCH} == "armv7"
 CONFIGURE_ARGS+=	--disable-jent-support
 .endif
 
 post-patch:
 	@${RM} ${WRKSRC}/doc/gcrypt.info*
 	@${REINPLACE_CMD} -e 's|ALIGN (3)|ALIGN (2)|g' ${WRKSRC}/mpi/i386/*.S
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/libgcrypt/files/extra-patch-no-info b/security/libgcrypt/files/extra-patch-no-info
new file mode 100644
index 000000000000..85d58af1cd98
--- /dev/null
+++ b/security/libgcrypt/files/extra-patch-no-info
@@ -0,0 +1,20 @@
+--- doc/Makefile.in.orig	2021-08-22 16:00:24 UTC
++++ doc/Makefile.in
+@@ -690,7 +690,7 @@ distdir-am: $(DISTFILES)
+ check-am: all-am
+ check: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) 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"; \
+@@ -750,7 +750,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
+