diff --git a/net/fb303/Makefile b/net/fb303/Makefile
index 9e0158927930..67a15dff7b2e 100644
--- a/net/fb303/Makefile
+++ b/net/fb303/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	fb303
-DISTVERSION=	g20210511
+DISTVERSION=	g20210709
 CATEGORIES=	net
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Base Thrift service and a common set of functionality
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
 		libdouble-conversion.so:devel/double-conversion \
 		libevent.so:devel/libevent \
 		libfizz.so:security/fizz \
 		libfmt.so:devel/libfmt \
 		libfolly.so:devel/folly \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		liblz4.so:archivers/liblz4 \
 		libsnappy.so:archivers/snappy \
 		libsodium.so:security/libsodium \
 		libthriftcpp2.so:devel/fbthrift \
 		libunwind.so:devel/libunwind \
 		libwangle.so:net/wangle \
 		libzstd.so:archivers/zstd
 
 USES=		cmake compiler:c++17-lang ssl
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebook
-GH_TAGNAME=	4968806
+GH_TAGNAME=	83ae662219660d30b49ad8474f5c63bbfc6d5f6f
 
 CXXFLAGS+=	-fPIC
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	PYTHON_EXTENSIONS
 
 post-install:
 	@${RMDIR} ${STAGEDIR}${PREFIX}/include/fb303/test
 
 .include <bsd.port.mk>
diff --git a/net/fb303/distinfo b/net/fb303/distinfo
index 90a1c1d14c8e..5d44ade6ba25 100644
--- a/net/fb303/distinfo
+++ b/net/fb303/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620796777
-SHA256 (facebook-fb303-g20210511-4968806_GH0.tar.gz) = c6842be8c11fc1963def03a2734fdeba3676541d7e4c42792342ec54e418dcc3
-SIZE (facebook-fb303-g20210511-4968806_GH0.tar.gz) = 237112
+TIMESTAMP = 1625850513
+SHA256 (facebook-fb303-g20210709-83ae662219660d30b49ad8474f5c63bbfc6d5f6f_GH0.tar.gz) = 47011442205176a7d0f763d48979bf30d7250b6ade96808ae66122d491accdc7
+SIZE (facebook-fb303-g20210709-83ae662219660d30b49ad8474f5c63bbfc6d5f6f_GH0.tar.gz) = 233451
diff --git a/net/fb303/pkg-plist b/net/fb303/pkg-plist
index f3e5eb7a68ca..f30be7b5c05f 100644
--- a/net/fb303/pkg-plist
+++ b/net/fb303/pkg-plist
@@ -1,53 +1,51 @@
 include/fb303/BaseService.h
 include/fb303/CallbackValuesMap-inl.h
 include/fb303/CallbackValuesMap.h
 include/fb303/DynamicCounters.h
 include/fb303/ExportType.h
 include/fb303/ExportedHistogramMap.h
 include/fb303/ExportedHistogramMapImpl.h
 include/fb303/ExportedStatMap.h
 include/fb303/ExportedStatMapImpl.h
 include/fb303/FollyLoggingHandler.h
 include/fb303/HistogramExporter.h
 include/fb303/LegacyClock.h
 include/fb303/MutexWrapper.h
 include/fb303/QuantileStat-inl.h
 include/fb303/QuantileStat.h
 include/fb303/ServiceData.h
 include/fb303/SimpleLRUMap.h
-include/fb303/SynchMap-inl.h
-include/fb303/SynchMap.h
 include/fb303/TFunctionStatHandler.h
 include/fb303/TLStatsAsyncAggregator.h
 include/fb303/TLStatsLockTraits.h
 include/fb303/ThreadCachedServiceData.h
 include/fb303/ThreadLocalStats-inl.h
 include/fb303/ThreadLocalStats.h
 include/fb303/ThreadLocalStatsMap-inl.h
 include/fb303/ThreadLocalStatsMap.h
 include/fb303/Timeseries-inl.h
 include/fb303/Timeseries.h
 include/fb303/TimeseriesExporter.h
 include/fb303/TimeseriesHistogram-inl.h
 include/fb303/TimeseriesHistogram.h
 include/fb303/detail/QuantileStatMap-inl.h
 include/fb303/detail/QuantileStatMap.h
 include/fb303/detail/QuantileStatWrappers-inl.h
 include/fb303/detail/QuantileStatWrappers.h
 include/fb303/thrift/gen-cpp2/BaseService.h
 include/fb303/thrift/gen-cpp2/BaseService.tcc
 include/fb303/thrift/gen-cpp2/BaseServiceAsyncClient.h
 include/fb303/thrift/gen-cpp2/BaseService_custom_protocol.h
 include/fb303/thrift/gen-cpp2/fb303_core_constants.h
 include/fb303/thrift/gen-cpp2/fb303_core_metadata.h
 include/fb303/thrift/gen-cpp2/fb303_core_types.h
 include/fb303/thrift/gen-cpp2/fb303_core_types.tcc
 include/fb303/thrift/gen-cpp2/fb303_core_types_custom_protocol.h
 include/thrift-files/fb303/thrift/fb303_core.thrift
 lib/cmake/fb303/fb303-config.cmake
 lib/cmake/fb303/fb303-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/fb303/fb303-targets.cmake
 lib/libfb303.so
 lib/libfb303.so.1.0.0
 lib/libfb303_thrift_cpp.so
 lib/libfb303_thrift_cpp.so.1.0.0