diff --git a/devel/valgrind-devel/Makefile b/devel/valgrind-devel/Makefile
index 9b6428ef0bd5..adbe0bf1bb80 100644
--- a/devel/valgrind-devel/Makefile
+++ b/devel/valgrind-devel/Makefile
@@ -1,85 +1,85 @@
 PORTNAME=	valgrind
-PORTVERSION=	3.20.0.g20220612
+PORTVERSION=	3.21.0.g20221028
 DISTVERSIONPREFIX=	freebsd-
 PORTEPOCH=	1
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	pjfloyd@wanadoo.fr
 COMMENT=	Memory debugging and profiling tool
 WWW=		https://www.valgrind.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 USES=		cpe pathfix pkgconfig gmake perl5 shebangfix autoreconf
 USE_PERL5=	build
 
 GNU_CONFIGURE=	yes
 SHEBANG_FILES=	callgrind/callgrind_annotate.in callgrind/callgrind_control.in
 SSP_UNSAFE=	yes
 LIB32_PATH?=	/usr/lib32/libc.so
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	paulfloyd
 GH_PROJECT=	freebsd_valgrind
-GH_TAGNAME=	d785030d3
+GH_TAGNAME=	8d64ffab7
 
 CONFLICTS=	valgrind
 
 CONFIGURE_ENV+=	ac_cv_path_PERL=${PERL}
 
 PORTDOCS=	html
 
 OPTIONS_DEFINE=		DOCS MANPAGES MPI
 OPTIONS_DEFINE_amd64=	32BIT
 OPTIONS_DEFAULT=	MANPAGES
 .if exists(${LIB32_PATH})
 OPTIONS_DEFAULT_amd64=	32BIT
 .endif
 OPTIONS_SUB=	yes
 
 32BIT_DESC=	Enable debugging of 32-bit programs (requires lib32)
 MPI_DESC=	Enable build of MPI wrappers
 
 DOCS_BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl \
 			xsltproc:textproc/libxslt
 MANPAGES_BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl \
 			xsltproc:textproc/libxslt
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "amd64"
 PLIST_SUB+=	AMD64=""
 . if !${PORT_OPTIONS:M32BIT}
 CONFIGURE_ARGS+=	--enable-only64bit
 PLIST_SUB+=	X86="@comment "
 . else
 .  if !exists(${LIB32_PATH})
 IGNORE=The lib32 distribution was not found. Please install the lib32\
 distribution or run 'make config' and uncheck 32BIT option
 .  endif
 PLIST_SUB+=	X86=""
 . endif
 .else
 PLIST_SUB+=	AMD64="@comment "
 PLIST_SUB+=	X86=""
 .endif
 
 .if !${PORT_OPTIONS:MDOCS}
 post-patch:
 	@${RM} -r ${WRKSRC}/docs/html
 .endif
 
 post-build:
 .if ${PORT_OPTIONS:MMANPAGES}
 	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} man-pages
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 	cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} html-docs
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/valgrind-devel/distinfo b/devel/valgrind-devel/distinfo
index b8ca236025b7..b8f8cf70b3f3 100644
--- a/devel/valgrind-devel/distinfo
+++ b/devel/valgrind-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1655043692
-SHA256 (paulfloyd-freebsd_valgrind-freebsd-3.20.0.g20220612-d785030d3_GH0.tar.gz) = f847ba09d2df963a1be94d6707fbeb16480ec2d47d71fd55c82e0a389a4534fa
-SIZE (paulfloyd-freebsd_valgrind-freebsd-3.20.0.g20220612-d785030d3_GH0.tar.gz) = 15983181
+TIMESTAMP = 1666979287
+SHA256 (paulfloyd-freebsd_valgrind-freebsd-3.21.0.g20221028-8d64ffab7_GH0.tar.gz) = 0fe2773755b4b0ef58e37ec66b1914c4083f6190c0e8fd5e066f8d2bea8ab75c
+SIZE (paulfloyd-freebsd_valgrind-freebsd-3.21.0.g20221028-8d64ffab7_GH0.tar.gz) = 15990113