diff --git a/devel/folly/Makefile b/devel/folly/Makefile
index 5d97d847b760..f2fdf35ed43c 100644
--- a/devel/folly/Makefile
+++ b/devel/folly/Makefile
@@ -1,52 +1,55 @@
 PORTNAME=	folly
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2023.06.12.00
+DISTVERSION=	2023.06.26.00
 CATEGORIES=	devel
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	e74fe5c99dd9d96b80b17f8396ce2568f2becb45.diff:-p1 # fix https://github.com/facebook/folly/issues/2019
+
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library developed and used at Facebook
 WWW=		https://github.com/facebook/folly
 
 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 \
 		libbzip2.so:misc/vxl \
 		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
 
 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
 #CMAKE_OFF+=	FOLLY_USE_JEMALLOC # Build fails with FOLLY_USE_JEMALLOC=OFF, see https://github.com/facebook/folly/issues/1893
 
 CXXFLAGS+=	-fPIC
 CXXFLAGS_powerpc64=	-DFOLLY_QUOTIENT_MULTI_SET_SUPPORTED=0
 
-do-test:
+do-test: # tests fail to compile, see https://github.com/facebook/folly/issues/2032
 	@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 b7f2970ad6e3..fbdeb48626ff 100644
--- a/devel/folly/distinfo
+++ b/devel/folly/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1686966150
-SHA256 (facebook-folly-v2023.06.12.00_GH0.tar.gz) = cb7d075f5610dcc50084d727ee675daad51733b049f0b07cc112b160e468599d
-SIZE (facebook-folly-v2023.06.12.00_GH0.tar.gz) = 3853096
+TIMESTAMP = 1688173429
+SHA256 (facebook-folly-v2023.06.26.00_GH0.tar.gz) = e7b58bf4eda24e2069b301e27533deb7c171dac57925cb90fe344595522772f3
+SIZE (facebook-folly-v2023.06.26.00_GH0.tar.gz) = 3859868
+SHA256 (e74fe5c99dd9d96b80b17f8396ce2568f2becb45.diff) = 19e50ddc436ee0bbdc759cfb0a4ebfd617ef9594a8c01eedb303e1fa26e9618c
+SIZE (e74fe5c99dd9d96b80b17f8396ce2568f2becb45.diff) = 652
diff --git a/devel/folly/files/patch-folly_experimental_symbolizer_Elf.h b/devel/folly/files/patch-folly_experimental_symbolizer_Elf.h
deleted file mode 100644
index f9386080ca1b..000000000000
--- a/devel/folly/files/patch-folly_experimental_symbolizer_Elf.h
+++ /dev/null
@@ -1,12 +0,0 @@
-- workaround for https://github.com/facebook/folly/issues/2015
-
---- folly/experimental/symbolizer/Elf.h.orig	2023-06-10 21:06:02 UTC
-+++ folly/experimental/symbolizer/Elf.h
-@@ -25,6 +25,7 @@
- #include <initializer_list>
- #include <stdexcept>
- #include <system_error>
-+#include <unordered_map>
- #include <unordered_set>
- 
- #include <folly/Conv.h>