diff --git a/security/s2n-tls/Makefile b/security/s2n-tls/Makefile
index e1625e0fea22..30db8c339a0c 100644
--- a/security/s2n-tls/Makefile
+++ b/security/s2n-tls/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	s2n-tls
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.5.7
+DISTVERSION=	1.5.8
 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
 
 PORTDOCS=	*.md doxygen examples images usage-guide
 PORTEXAMPLES=	Makefile *.c
 
 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
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/bin && ${COPYTREE_SHARE} "${PORTEXAMPLES}" ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/security/s2n-tls/distinfo b/security/s2n-tls/distinfo
index 4bd42b8d2e40..3f7bc0aeae24 100644
--- a/security/s2n-tls/distinfo
+++ b/security/s2n-tls/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1730483515
-SHA256 (aws-s2n-tls-v1.5.7_GH0.tar.gz) = c30b97c8bcccc0557331dd1a043010a70984c9cff11b0bbd769651db68f8b91d
-SIZE (aws-s2n-tls-v1.5.7_GH0.tar.gz) = 4930388
+TIMESTAMP = 1731486358
+SHA256 (aws-s2n-tls-v1.5.8_GH0.tar.gz) = ab806d41dd03577d3ad0cdea7bb95e8b32ccf8e0b757b297a9929bc65e7d5fd0
+SIZE (aws-s2n-tls-v1.5.8_GH0.tar.gz) = 4925621