diff --git a/devel/folly/Makefile b/devel/folly/Makefile
index bf0f422cde5f..9e9d14a04edd 100644
--- a/devel/folly/Makefile
+++ b/devel/folly/Makefile
@@ -1,50 +1,49 @@
 PORTNAME=	folly
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2022.07.18.00
+DISTVERSION=	2022.07.25.00
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library developed and used at Facebook
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	error: use of undeclared identifier 'DCHECK': https://github.com/facebook/folly/issues/1168
 
 BUILD_DEPENDS=	elfutils>0:devel/elfutils # workaround for missing symbols like DW_UT_compile: https://github.com/facebook/folly/issues/1654
 LIB_DEPENDS=	libboost_atomic.so:devel/boost-libs \
 		libdouble-conversion.so:devel/double-conversion \
 		libevent.so:devel/libevent \
 		libfmt.so:devel/libfmt \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libicui18n.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
 		libsnappy.so:archivers/snappy \
 		libsodium.so:security/libsodium \
 		libunwind.so:devel/libunwind \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	elfutils>0:devel/elfutils # workaround for missing symbols like DW_UT_compile: https://github.com/facebook/folly/issues/1654
 TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		cmake compiler:c++17-lang cpe localbase ssl
 USE_LDCONFIG=	yes
 
 CPE_VENDOR=	facebook
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebook
-GH_TAGNAME=	437b29dd062a40c741b2147827025a2f413b76c7 # includes fixes to build 2022.07.18.00
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	FREEBSD_BUILD_EXAMPLES FREEBSD_FOLLY_USE_SYMBOLIZER # enabling symbolizer causes undefined symbol _r_debug, see https://github.com/facebook/folly/issues/1373
 
 CXXFLAGS+=	-fPIC
 CXXFLAGS_powerpc64=	-DFOLLY_QUOTIENT_MULTI_SET_SUPPORTED=0
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/devel/folly/distinfo b/devel/folly/distinfo
index f37b5e4ba874..00e42a13830e 100644
--- a/devel/folly/distinfo
+++ b/devel/folly/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1658519990
-SHA256 (facebook-folly-v2022.07.18.00-437b29dd062a40c741b2147827025a2f413b76c7_GH0.tar.gz) = 2529ec88430dc1631d3d5ddc6248de0033d28e2031d72e85bc417af6f2108f86
-SIZE (facebook-folly-v2022.07.18.00-437b29dd062a40c741b2147827025a2f413b76c7_GH0.tar.gz) = 3684376
+TIMESTAMP = 1658819383
+SHA256 (facebook-folly-v2022.07.25.00_GH0.tar.gz) = ba34d39704cc8cecb4b8765c4b28b20b416de1bbbda0c3a8eedc5fb29f023a73
+SIZE (facebook-folly-v2022.07.25.00_GH0.tar.gz) = 3681096