diff --git a/sysutils/s6/Makefile b/sysutils/s6/Makefile
index 5eb9b7f7ec51..0b040639e3a8 100644
--- a/sysutils/s6/Makefile
+++ b/sysutils/s6/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	s6
-DISTVERSION=	2.11.3.2
+DISTVERSION=	2.12.0.4
 CATEGORIES=	sysutils
 MASTER_SITES=	https://www.skarnet.org/software/${PORTNAME}/
 
@@ -10,7 +10,8 @@ WWW=		https://www.skarnet.org/software/s6/
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	execline>=2.9.3.0:lang/execline
+BUILD_DEPENDS=	execline>=2.9.5.1:lang/execline \
+		skalibs>=2.14.1.1:devel/skalibs
 LIB_DEPENDS=	libskarnet.so:devel/skalibs
 RUN_DEPENDS=	execlineb:lang/execline
 
@@ -39,7 +40,6 @@ post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libs6.so.${PORTVERSION}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libs6auto.so.${PORTVERSION}
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/s6lockd-helper
 	cd ${WRKDIR} && ${INSTALL_SCRIPT} s6-svscanboot \
 		${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/s6-svscan/env
diff --git a/sysutils/s6/distinfo b/sysutils/s6/distinfo
index bd290f618dd9..cd2d78fcaac4 100644
--- a/sysutils/s6/distinfo
+++ b/sysutils/s6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1680559067
-SHA256 (s6-2.11.3.2.tar.gz) = 7c16138ad2f0ffbe0ed2ae8dd0cecada9f7c787edd33a69084d219110693df74
-SIZE (s6-2.11.3.2.tar.gz) = 247882
+TIMESTAMP = 1716814822
+SHA256 (s6-2.12.0.4.tar.gz) = c95d51787602e0c8c8e4f92a710cbdaa4ee797ee886e71342727e2974f95c06b
+SIZE (s6-2.12.0.4.tar.gz) = 255314
diff --git a/sysutils/s6/pkg-plist b/sysutils/s6/pkg-plist
index 8c77f0615f93..43b2a2202cc2 100644
--- a/sysutils/s6/pkg-plist
+++ b/sysutils/s6/pkg-plist
@@ -62,7 +62,6 @@ bin/s6-svwait
 bin/s6-tai64n
 bin/s6-tai64nlocal
 bin/s6-usertree-maker
-bin/s6lockd
 bin/ucspilogd
 @sample %%ETCDIR%%/s6-svscan-log/run.sample
 @sample %%ETCDIR%%/s6-svscan/env/PATH.sample
@@ -79,14 +78,13 @@ include/s6/s6.h
 include/s6/servicedir.h
 include/s6/supervise.h
 lib/libs6.so
-lib/libs6.so.2.11
-lib/libs6.so.2.11.3.2
+lib/libs6.so.2.12
+lib/libs6.so.2.12.0.4
 lib/libs6auto.so
-lib/libs6auto.so.2.11
-lib/libs6auto.so.2.11.3.2
+lib/libs6auto.so.2.12
+lib/libs6auto.so.2.12.0.4
 lib/s6/libs6.a
 lib/s6/libs6auto.a
-libexec/s6lockd-helper
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/fifodir.html
@@ -165,5 +163,6 @@ libexec/s6lockd-helper
 %%PORTDOCS%%%%DOCSDIR%%/servicedir.html
 %%PORTDOCS%%%%DOCSDIR%%/socket-activation.html
 %%PORTDOCS%%%%DOCSDIR%%/ucspilogd.html
+%%PORTDOCS%%%%DOCSDIR%%/unit-conversion.html
 %%PORTDOCS%%%%DOCSDIR%%/upgrade.html
 %%PORTDOCS%%%%DOCSDIR%%/why.html