diff --git a/sysutils/s6/Makefile b/sysutils/s6/Makefile
index 323a3b937460..30b71291ade3 100644
--- a/sysutils/s6/Makefile
+++ b/sysutils/s6/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	s6
 DISTVERSION=	2.13.1.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://www.skarnet.org/software/${PORTNAME}/
 
 MAINTAINER=	crest@rlwinm.de
 COMMENT=	Skarnet.org supervision suite
 WWW=		https://www.skarnet.org/software/s6/
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	execline>=2.9.6.1:lang/execline \
 		skalibs>=2.14.3.0:devel/skalibs
 LIB_DEPENDS=	libskarnet.so:devel/skalibs
 RUN_DEPENDS=	execlineb:lang/execline
 
 USES=		gmake
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	s6
 
 SERVICE_DIR?=	/var/service
 SUB_FILES=	s6-svscan_finish s6-svscan-log_run s6-svscanboot s6-svscan_env_PATH
 SUB_LIST=	SERVICE_DIR="${SERVICE_DIR}"
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-default-path=${LOCALBASE}/bin:/usr/bin:/bin \
 		--with-include=${LOCALBASE}/include \
 		--with-dynlib=${LOCALBASE}/lib \
 		--with-lib=${LOCALBASE}/lib \
 		--with-lib=${LOCALBASE}/lib/execline \
 		--enable-shared
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS=		AUTHORS README doc/*.html
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libs6.so.${PORTVERSION}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libs6auto.so.${PORTVERSION}
 	cd ${WRKDIR} && ${INSTALL_SCRIPT} s6-svscanboot \
 		${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/s6-svscan/env
 	cd ${WRKDIR} && ${INSTALL_SCRIPT} s6-svscan_finish \
 		${STAGEDIR}${ETCDIR}/s6-svscan/finish.sample
 	cd ${WRKDIR} && ${INSTALL_DATA} s6-svscan_env_PATH \
 		${STAGEDIR}${ETCDIR}/s6-svscan/env/PATH.sample
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/s6-svscan-log
 	cd ${WRKDIR} && ${INSTALL_SCRIPT} s6-svscan-log_run \
 		${STAGEDIR}${ETCDIR}/s6-svscan-log/run.sample
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/s6/files/s6.in b/sysutils/s6/files/s6.in
index b5a864ede58f..4f3d94037954 100644
--- a/sysutils/s6/files/s6.in
+++ b/sysutils/s6/files/s6.in
@@ -1,49 +1,50 @@
 #!/bin/sh
 
 # PROVIDE: /service
 # BEFORE:  SERVERS
 # KEYWORD: shutdown
+# REQUIRE: ldconfig
 
 # Add the following lines to /etc/rc.conf to enable `s6':
 #
 #s6_enable="YES"		(default: NO)
 #s6_path="/service"		(default: %%SERVICE_DIR%%)
 #
 
 . /etc/rc.subr
 
 name=s6
 rcvar=s6_enable
 
 load_rc_config s6
 
 : ${s6_enable:=NO}
 : ${s6_path:=%%SERVICE_DIR%%}
 
 s6_log=${s6_path}/s6-svscan-log
 s6_svc=${s6_path}/.s6-svscan
 
 command="%%PREFIX%%/bin/s6-svscanboot"
 start_cmd=s6_start
 stop_cmd="%%PREFIX%%/bin/s6-svscanctl -t ${s6_path}"
 stop_postcmd="%%PREFIX%%/bin/s6-svc -h ${s6_log}/"
 
 s6_start()
 {
 	/bin/test -d ${s6_path} || /bin/mkdir -p ${s6_path}
 	/bin/test -L ${s6_log} || /bin/ln -sh %%PREFIX%%/etc/s6/s6-svscan-log \
 		${s6_log}
 	/bin/test -L ${s6_svc} || /bin/ln -sh %%PREFIX%%/etc/s6/s6-svscan \
 		${s6_svc}
 	/usr/bin/env -i \
 	PATH=/command:%%PREFIX%%/sbin:%%PREFIX%%/bin:/sbin:/bin:/usr/sbin:/usr/bin \
 	/usr/sbin/daemon \
 	${command} ${s6_path}
 }
 
 s6_stop()
 {
 	${stop_cmd}
 }
 
 run_rc_command $1