diff --git a/security/s2n-tls/Makefile b/security/s2n-tls/Makefile
index 6c558ed60a83..711002920074 100644
--- a/security/s2n-tls/Makefile
+++ b/security/s2n-tls/Makefile
@@ -1,48 +1,45 @@
 PORTNAME=	s2n-tls
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.3.39
+DISTVERSION=	1.3.40
 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
 
-NOT_FOR_ARCHS=	armv6 armv7 i386
-NOT_FOR_ARCHS_REASON=	-Werror=sign-compare fails on 32-bit architectures, see https://github.com/aws/s2n-tls/issues/3861
-
 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}
 
 .include <bsd.port.mk>
diff --git a/security/s2n-tls/distinfo b/security/s2n-tls/distinfo
index 19aaabddb550..be18c29e5c1d 100644
--- a/security/s2n-tls/distinfo
+++ b/security/s2n-tls/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678739105
-SHA256 (aws-s2n-tls-v1.3.39_GH0.tar.gz) = 7b32b3f61f609a5408f331d3e08c835981a5b8d1298b6ec8e8d6cf24a0a66a0c
-SIZE (aws-s2n-tls-v1.3.39_GH0.tar.gz) = 4188578
+TIMESTAMP = 1679516989
+SHA256 (aws-s2n-tls-v1.3.40_GH0.tar.gz) = d365027221f105ff2c547ff3bffc0c2764242494b62c186e13e3bca272cab2c0
+SIZE (aws-s2n-tls-v1.3.40_GH0.tar.gz) = 4193907