diff --git a/print/texinfo/Makefile b/print/texinfo/Makefile
index 0662b0d4904b..b7c5c7a39ff2 100644
--- a/print/texinfo/Makefile
+++ b/print/texinfo/Makefile
@@ -1,67 +1,67 @@
 # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 
 PORTNAME=	texinfo
 PORTVERSION=	6.7
-PORTREVISION=	5
+PORTREVISION=	6
 PORTEPOCH=	1
 CATEGORIES=	print
 MASTER_SITES=	GNU \
 		LOCAL/sunpoet/texinfo:DEFAULT,local
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		htmlxref.cnf-${HTMLXREF_CNF_RELDATE}:local \
 		texi2dvi-${TEXI2DVI_RELDATE}:local \
 		texinfo.tex-${TEXINFO_TEX_RELDATE}:local
 DIST_SUBDIR=	texinfo
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Typeset documentation system with multiple format output
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	help2man:misc/help2man \
 		${RUN_DEPENDS}
 RUN_DEPENDS=	p5-Locale-libintl>=0:devel/p5-Locale-libintl \
 		p5-Text-Unidecode>=0:converters/p5-Text-Unidecode \
 		p5-Unicode-EastAsianWidth>=0:textproc/p5-Unicode-EastAsianWidth
 
 OPTIONS_DEFINE=	NLS
 OPTIONS_SUB=	yes
 
 USES=		charsetfix cpe gmake iconv libtool ncurses perl5 tar:xz
 
 CONFIGURE_ARGS=	--with-external-libintl-perl \
 		--with-external-Text-Unidecode \
 		--with-external-Unicode-EastAsianWidth
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip install-tex
 MAKE_ARGS=	PERL=${PERL} TEXMF=${LOCALBASE}/${TEXMFDIR}
 PKGDEINSTALL=	${PKGINSTALL}
 USE_TEX=	yes
 
 INFO=		info-stnd texinfo
 
 # Use the date on https://ftp.gnu.org/gnu/texinfo/
 HTMLXREF_CNF_RELDATE=	20201020
-TEXI2DVI_RELDATE=	20210216
-TEXINFO_TEX_RELDATE=	20210223
+TEXI2DVI_RELDATE=	20210703
+TEXINFO_TEX_RELDATE=	20210615
 
 CPE_VENDOR=	gnu
 CPE_VERSION=	${PORTVERSION:R}
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
 post-patch:
 	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/texinfo.tex-${TEXINFO_TEX_RELDATE} ${WRKSRC}/doc/texinfo.tex
 	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/htmlxref.cnf-${HTMLXREF_CNF_RELDATE} ${WRKSRC}/util/htmlxref.cnf
 	@${INSTALL_SCRIPT} ${DISTDIR}/${DIST_SUBDIR}/texi2dvi-${TEXI2DVI_RELDATE} ${WRKSRC}/util/texi2dvi
 	@${REINPLACE_CMD} -e '/rm -f $$(DESTDIR)/ s|$$| $$(DESTDIR)$$(xsdir)/XSParagraph.*|' ${WRKSRC}/tp/Texinfo/XS/Makefile.in
 	@${REINPLACE_CMD} -e 's|free (.*)|Safe&|' ${WRKSRC}/tp/Texinfo/XS/misc.c
 	@${REINPLACE_CMD} -e 's/tinfo/tinfow/g' ${WRKSRC}/configure
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/util/htmlxref.cnf ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/print/texinfo/distinfo b/print/texinfo/distinfo
index 447fa8ae29f8..070fe401131b 100644
--- a/print/texinfo/distinfo
+++ b/print/texinfo/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1619198393
+TIMESTAMP = 1625585436
 SHA256 (texinfo/texinfo-6.7.tar.xz) = 988403c1542d15ad044600b909997ba3079b10e03224c61188117f3676b02caa
 SIZE (texinfo/texinfo-6.7.tar.xz) = 4337984
 SHA256 (texinfo/htmlxref.cnf-20201020) = eb8f4a17a4890030d8db2b728deec11d86a9343f696a50fc65f7e4a048520c90
 SIZE (texinfo/htmlxref.cnf-20201020) = 20246
-SHA256 (texinfo/texi2dvi-20210216) = bc786c00fcf2056c648fa788d3d14c32b89aab932a69a4139ce3a75244c39c8c
-SIZE (texinfo/texi2dvi-20210216) = 59646
-SHA256 (texinfo/texinfo.tex-20210223) = 02591bec8293117cb17f2f2f7e4447109d34c4c5d76d1e022c6dafda49a4c9fc
-SIZE (texinfo/texinfo.tex-20210223) = 379422
+SHA256 (texinfo/texi2dvi-20210703) = 6fbc3a9a4f1166e8f0b4fd68ee29b22ba4465f03a7aac77d619d7a991c531f70
+SIZE (texinfo/texi2dvi-20210703) = 59645
+SHA256 (texinfo/texinfo.tex-20210615) = 136b6ff32fff510736779d5fdfc7c20e9bb00792a06b3ad1a597215cfb9a9fb8
+SIZE (texinfo/texinfo.tex-20210615) = 374377