diff --git a/Mk/Uses/nodejs.mk b/Mk/Uses/nodejs.mk
index 36db2250bfd3..d758bba2adcb 100644
--- a/Mk/Uses/nodejs.mk
+++ b/Mk/Uses/nodejs.mk
@@ -7,7 +7,7 @@
 #   - build     use node as build-time dependency
 #   - run       use node as runtime dependency
 #   - env       set the environment (NODEJS_VERSION and NODEJS_SUFFIX)
-#   - version   available version: lts, current, 20, 22, 23, 24
+#   - version   available version: lts, current, 18, 20, 22, 23, 24
 #
 # Note:
 # - The supported versions follow upstream release schedule
@@ -22,13 +22,13 @@
 .if !defined(_INCLUDE_USES_NODEJS_MK)
 _INCLUDE_USES_NODEJS_MK=	yes
 
-_VALID_NODEJS_VERSIONS=	20 22 23 24 current lts
+_VALID_NODEJS_VERSIONS=	18 20 22 23 24 current lts
 
 .  if ! ${_VALID_NODEJS_VERSIONS:M${NODEJS_DEFAULT}}
 IGNORE=	Invalid default nodejs version ${NODEJS_DEFAULT}; valid versions are ${_VALID_NODEJS_VERSIONS}
 .  endif
 
-.  if !empty(nodejs_ARGS:Nbuild:Nenv:Nrun:Nlts:Ncurrent:N20:N22:N23:N24)
+.  if !empty(nodejs_ARGS:Nbuild:Nenv:Nrun:Nlts:Ncurrent:N18:N20:N22:N23:N24)
 IGNORE=		USES=nodejs has invalid arguments ${nodejs_ARGS}
 .  endif
 
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 799e2129264e..0e2a4a9c9caf 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -105,7 +105,7 @@ MONO_DEFAULT?=		5.20
 MYSQL_DEFAULT?=		8.0
 # Possible values: ninja, samurai
 NINJA_DEFAULT?=		ninja
-# Possible value: 20, 22, 23, 24, current, lts (Note: current = 24 and lts = 22)
+# Possible value: 18, 20, 22, 23, 24, current, lts (Note: current = 24 and lts = 22)
 NODEJS_DEFAULT?=	lts
 # Possible value: 25, 26
 OPENLDAP_DEFAULT?=	26
diff --git a/security/s2n-tls/Makefile b/security/s2n-tls/Makefile
index 3a9b2ded6c75..260a1aa65cdd 100644
--- a/security/s2n-tls/Makefile
+++ b/security/s2n-tls/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	s2n-tls
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.5.19
+DISTVERSION=	1.5.20
 PORTEPOCH=	1
 CATEGORIES=	security
 
diff --git a/security/s2n-tls/distinfo b/security/s2n-tls/distinfo
index efbf352f1e08..40f9e5e1a2dc 100644
--- a/security/s2n-tls/distinfo
+++ b/security/s2n-tls/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1748009059
-SHA256 (aws-s2n-tls-v1.5.19_GH0.tar.gz) = cb67993d43b39f583ea864d29b028bc258cc0866704f45eedc7ca064e48987ac
-SIZE (aws-s2n-tls-v1.5.19_GH0.tar.gz) = 5024295
+TIMESTAMP = 1748802843
+SHA256 (aws-s2n-tls-v1.5.20_GH0.tar.gz) = 1d05303ba8383f62273c51b50147391c23375e918d525b7c827f7aeb69e6b102
+SIZE (aws-s2n-tls-v1.5.20_GH0.tar.gz) = 5041463
diff --git a/security/s2n-tls/pkg-plist b/security/s2n-tls/pkg-plist
index 2a1bdd7c97ff..f88ebe2704ec 100644
--- a/security/s2n-tls/pkg-plist
+++ b/security/s2n-tls/pkg-plist
@@ -1,6 +1,8 @@
 include/s2n.h
+include/s2n/unstable/cert_authorities.h
 include/s2n/unstable/cleanup.h
 include/s2n/unstable/crl.h
+include/s2n/unstable/custom_x509_extensions.h
 include/s2n/unstable/fingerprint.h
 include/s2n/unstable/ktls.h
 include/s2n/unstable/npn.h