diff --git a/math/cado-nfs/Makefile b/math/cado-nfs/Makefile
index 3ff549456871..42826436aedf 100644
--- a/math/cado-nfs/Makefile
+++ b/math/cado-nfs/Makefile
@@ -1,48 +1,45 @@
 PORTNAME=	cado-nfs
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.3.0.20220612
+DISTVERSION=	2.3.0.20220722
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Implementation of the Number Field Sieve Algorithm
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_armv6=	unused function 'purge_matrix_compute_sum2_row_mt', see https://gitlab.inria.fr/cado-nfs/cado-nfs/-/issues/30045
-BROKEN_armv7=	unused function 'purge_matrix_compute_sum2_row_mt', see https://gitlab.inria.fr/cado-nfs/cado-nfs/-/issues/30045
-
 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_GITLAB=	yes
 GL_SITE=	https://gitlab.inria.fr
-GL_COMMIT=	9044db91bbb2cc853f27b166862077c8ce8e8686
+GL_COMMIT=	3ab6a4781fa5d218ed332834809ba6c6fd1a591f
 
 SHEBANG_GLOB=	*.py
 
 CXXFLAGS_i386=	-msse2 # workaround for error: always_inline function '_mm_setzero_si128' requires target feature 'sse2', but would be inlined into function 'gf2x_mul4' that is compiled without support for 'sse2'
 
 TEST_TARGET=	check # 'test' does the same but is less verbose
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} make=${GMAKE}
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == amd64
 PLIST_SUB=	LINGEN_PZ=""
 .else
 PLIST_SUB=	LINGEN_PZ="@comment "
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/cado-nfs/distinfo b/math/cado-nfs/distinfo
index dcfb9407aa68..390cf1398a06 100644
--- a/math/cado-nfs/distinfo
+++ b/math/cado-nfs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1656914582
-SHA256 (cado-nfs-cado-nfs-9044db91bbb2cc853f27b166862077c8ce8e8686_GL0.tar.gz) = 48d754683ce35c9791809eca6c197d7312a4fad1e7ce1fddb22502631a95f2e3
-SIZE (cado-nfs-cado-nfs-9044db91bbb2cc853f27b166862077c8ce8e8686_GL0.tar.gz) = 4741170
+TIMESTAMP = 1658477035
+SHA256 (cado-nfs-cado-nfs-3ab6a4781fa5d218ed332834809ba6c6fd1a591f_GL0.tar.gz) = 8f93d56f0cfef0693110882509365da192fc1ebd52307af3a1a763e0fb068fea
+SIZE (cado-nfs-cado-nfs-3ab6a4781fa5d218ed332834809ba6c6fd1a591f_GL0.tar.gz) = 4742485