diff --git a/math/cado-nfs/Makefile b/math/cado-nfs/Makefile
index db8d7b42ac8b..3c83cb3611e4 100644
--- a/math/cado-nfs/Makefile
+++ b/math/cado-nfs/Makefile
@@ -1,37 +1,36 @@
 PORTNAME=	cado-nfs
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.3.0.20210806
+DISTVERSION=	2.3.0.20210915
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Implementation of the Number Field Sieve Algorithm
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_i386=	pkg-static: Unable to access file /wrkdirs/usr/ports/math/cado-nfs/work/stage/usr/local/lib/cado-nfs-3.0.0/linalg/bwc/lingen_pz:No such file or directory
 CONFLICTS_BUILD=	libfmt # bundled libfmt conflicts with package-installed headers
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
 		bash:shells/bash \
 		gmake:devel/gmake
 LIB_DEPENDS=	libecm.so:math/gmp-ecm \
 		libgf2x.so:math/gf2x \
 		libgmp.so:math/gmp \
 		libhwloc.so:devel/hwloc2
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
 USES=		cmake:noninja compiler:c++11-lang perl5 python shebangfix # noninja because: bad $-escape (literal $ must be written as $$)
-USE_GCC=	yes # fails in clang-11 with various STL and C++ errors. Reported to the upstream author Emmanuel Thomé on 2021-08-13.
 
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.inria.fr
-GL_COMMIT=	c5b20eac12ea225a325d582923ef058832cda28e
+GL_COMMIT=	f4284e2391121b2bfb97bc4880b6273c7250dc2f
 
 SHEBANG_GLOB=	*.py
 
 TEST_TARGET=	check # 'test' does the same but is less verbose
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} make=${GMAKE}
 
 .include <bsd.port.mk>
diff --git a/math/cado-nfs/distinfo b/math/cado-nfs/distinfo
index 43a82a4057f2..a14862fd2622 100644
--- a/math/cado-nfs/distinfo
+++ b/math/cado-nfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1628843872
-SHA256 (cado-nfs-cado-nfs-c5b20eac12ea225a325d582923ef058832cda28e_GL0.tar.gz) = 3d50b58fb5235f8ac35913f9fb350ff45da0f533810675e5ed17f07c3fd7b55d
-SIZE (cado-nfs-cado-nfs-c5b20eac12ea225a325d582923ef058832cda28e_GL0.tar.gz) = 4571150
+TIMESTAMP = 1631773002
+SHA256 (cado-nfs-cado-nfs-f4284e2391121b2bfb97bc4880b6273c7250dc2f_GL0.tar.gz) = 0f6c8303cadc637647606eb3530f822b5c46e2120dddf942bb55714134c9efd5
+SIZE (cado-nfs-cado-nfs-f4284e2391121b2bfb97bc4880b6273c7250dc2f_GL0.tar.gz) = 4661250