diff --git a/databases/foundationdb-devel/Makefile b/databases/foundationdb-devel/Makefile
index 91872df7ccf1..db539e8b0fe5 100644
--- a/databases/foundationdb-devel/Makefile
+++ b/databases/foundationdb-devel/Makefile
@@ -1,89 +1,88 @@
 PORTNAME=	foundationdb-devel
-DISTVERSION=	7.0.0.a.20210224
+DISTVERSION=	7.0.0.a.20210423
 CATEGORIES=	databases
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/pull/
-PATCHFILES+=	4373.patch:-p1 # https://github.com/apple/foundationdb/pull/4373
+# PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/pull/
 
 MAINTAINER=	dch@FreeBSD.org
 COMMENT=	Distributed, transactional key-value store
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_FreeBSD_11=	requires newer OpenSSL
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	not yet ported to anything other than amd64
 
 BUILD_DEPENDS=	${LOCALBASE}/include/doctest/doctest.h:devel/doctest \
 		${LOCALBASE}/include/toml.hpp:devel/toml11 \
 		bash:shells/bash \
 		git:devel/git
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libeio.so:devel/libeio
 
 USES=		compiler:c++17-lang cmake mono:build python:build shebangfix ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	apple
 GH_PROJECT=	foundationdb
-GH_TAGNAME=	8580250
+GH_TAGNAME=	c62a798
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	foundationdb
 
 SHEBANG_FILES=	bindings/c/generate_asm.py
 
 CMAKE_ARGS=	-DOPENSSL_ROOT_DIR=${OPENSSLLIB}
 CMAKE_OFF=	USE_DTRACE DISABLE_TLS USE_JEMALLOC
 
 USERS=		foundationdb
 GROUPS=		foundationdb
 DBDIR?=		/var/db/foundationdb
 LOGDIR?=	/var/log/foundationdb
 
 SUB_FDB=	DB_USER=${USERS} \
 		DB_GROUP=${GROUPS} \
 		DB_DIR=${DBDIR} \
 		LOG_DIR=${LOGDIR}
 SUB_FILES+=	foundationdb.conf
 SUB_LIST+=	${SUB_FDB}
 PLIST_SUB+=	${SUB_FDB}
 
 
 post-patch:
 		${REINPLACE_CMD} 's/OPENSSL_USE_STATIC_LIBS TRUE/OPENSSL_USE_STATIC_LIBS FALSE/' \
 		${WRKSRC}/cmake/FDBComponents.cmake
 
 do-install:
 	# commands on first line, dev tools on next two
 .for f in fdbbackup fdbcli fdbmonitor fdbserver \
 	    actor_flamegraph fdb_c_performance_test fdb_c_ryw_benchmark \
 	    fdb_c_txn_size_test fdb_flow_tester fdbconvert fdbdecode mako tutorial
 	${INSTALL_PROGRAM} ${WRKDIR}/.build/bin/${f} ${STAGEDIR}${PREFIX}/bin/
 .endfor
 	# confirm with upstream if these are actually needed
 .for s in backup_agent dr_agent fastrestore_agent fdbr fdbrestore
 	${RLN} ${STAGEDIR}${PREFIX}/bin/fdbbackup ${STAGEDIR}${PREFIX}/bin/${s}
 .endfor
 	# exposed libraries - confirm with upstream
 .for l in libfdb_c.so libfdb_flow.a libfdb_sqlite.a libfdbclient.a \
 	    libfdbrpc.a libflow.a
 	${STRIP_CMD} ${WRKDIR}/.build/lib/${l}
 	${INSTALL_DATA} ${WRKDIR}/.build/lib/${l} ${STAGEDIR}/${PREFIX}/lib/
 .endfor
 	# exposed headers - confirm with upstream
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/foundationdb
 	${INSTALL_DATA} ${WRKSRC}/bindings/c/foundationdb/fdb_c.h \
 	    ${STAGEDIR}/${PREFIX}/include/foundationdb/
 	${INSTALL_DATA} ${WRKSRC}/fdbclient/vexillographer/fdb.options \
 	    ${STAGEDIR}/${PREFIX}/include/foundationdb/
 	${INSTALL_DATA} ${WRKDIR}/.build/bindings/c/foundationdb/fdb_c_options.g.h \
 	    ${STAGEDIR}/${PREFIX}/include/foundationdb/
 	# runtime related
 	${MKDIR} ${STAGEDIR}${DBDIR} \
 	    ${STAGEDIR}${LOGDIR} \
 	    ${STAGEDIR}${PREFIX}/etc/foundationdb
 	${INSTALL_DATA} ${WRKDIR}/foundationdb.conf \
 	    ${STAGEDIR}${PREFIX}/etc/foundationdb/foundationdb.conf.sample
 
 .include <bsd.port.mk>
diff --git a/databases/foundationdb-devel/distinfo b/databases/foundationdb-devel/distinfo
index f5352299a4b2..ef4878eefd6f 100644
--- a/databases/foundationdb-devel/distinfo
+++ b/databases/foundationdb-devel/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1614158402
-SHA256 (apple-foundationdb-7.0.0.a.20210224-8580250_GH0.tar.gz) = c5ea44f8a572dc51d1d983b63f33823c0f3ef61bc2cf4e21b526ffe2335725f2
-SIZE (apple-foundationdb-7.0.0.a.20210224-8580250_GH0.tar.gz) = 9697782
-SHA256 (4373.patch) = 88281a9e5b431f06da541e22c5a34f7846c198016ecbad227d3037cf58e5f0de
-SIZE (4373.patch) = 945
+TIMESTAMP = 1619172629
+SHA256 (apple-foundationdb-7.0.0.a.20210423-c62a798_GH0.tar.gz) = 91b740ea1526e76510935c0e077cd5032d0345133d84a664f6963e1f45f666b8
+SIZE (apple-foundationdb-7.0.0.a.20210423-c62a798_GH0.tar.gz) = 9809161