diff --git a/security/s2n-tls/Makefile b/security/s2n-tls/Makefile
index 9ab910199a01..66d433df8bc2 100644
--- a/security/s2n-tls/Makefile
+++ b/security/s2n-tls/Makefile
@@ -1,48 +1,46 @@
 PORTNAME=	s2n-tls
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.3.30
+DISTVERSION=	1.3.31
 PORTEPOCH=	1
 CATEGORIES=	security
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	C99 implementation of the TLS/SSL protocols
 WWW=		https://github.com/aws/s2n-tls
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake:testing ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	aws
 
 USE_LDCONFIG=	yes
 CMAKE_OFF=	BUILD_TESTING
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS EXAMPLES LTO
 OPTIONS_DEFINE_amd64=	ASM
 OPTIONS_DEFAULT=	LTO
 
 ASM_DESC=	Enable PQ crypto assembly (reqs AVX2 and BMI2 support)
 
 ASM_CMAKE_OFF=	-DS2N_NO_PQ_ASM=1
 LTO_CMAKE_BOOL=	S2N_LTO
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} != aarch64 && ${ARCH} != amd64 && ${ARCH} != arm && ${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != i386
 CMAKE_ON+=	S2N_NO_PQ
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CP} -r ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/bin/*.c ${STAGEDIR}${EXAMPLESDIR}
 
-# testunit fails: https://github.com/aws/s2n-tls/issues/3489
-
 .include <bsd.port.mk>
diff --git a/security/s2n-tls/distinfo b/security/s2n-tls/distinfo
index 93ba52c4f934..1d9e3b06684f 100644
--- a/security/s2n-tls/distinfo
+++ b/security/s2n-tls/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1670590680
-SHA256 (aws-s2n-tls-v1.3.30_GH0.tar.gz) = b21d52fdfd52f7cf0c19084b8a43ef706bcfc89705fc5ec2baba2601cd6b53de
-SIZE (aws-s2n-tls-v1.3.30_GH0.tar.gz) = 4132047
+TIMESTAMP = 1671095281
+SHA256 (aws-s2n-tls-v1.3.31_GH0.tar.gz) = 23cfb42f82cbe1ce94b59f3b1c1c8eb9d24af2a1ae4c8f854209ff88fddd3900
+SIZE (aws-s2n-tls-v1.3.31_GH0.tar.gz) = 4133622