diff --git a/srcpkgs/s6/template b/srcpkgs/s6/template
index c23c02e4f33..da6adbf9015 100644
--- a/srcpkgs/s6/template
+++ b/srcpkgs/s6/template
@@ -1,7 +1,7 @@
 # Template file for 's6'
 pkgname=s6
 version=2.9.2.0
-revision=1
+revision=2
 build_style=configure
 configure_args="--libdir=/usr/lib --bindir=/usr/bin
  --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
@@ -17,7 +17,10 @@ distfiles="http://skarnet.org/software/s6/s6-${version}.tar.gz"
 checksum=363db72af8fffba764b775c872b0749d052805b893b07888168f59a841e9dddd
 
 case "$XBPS_TARGET_MACHINE" in
-	*-musl) makedepends+=" nsss-devel" configure_args+=" --enable-nsss" ;;
+	*-musl)
+		makedepends+=" nsss-devel"
+		configure_args+=" --enable-nsss --with-include=${XBPS_CROSS_BASE}/usr/include/nsss"
+		;;
 esac
 
 post_install() {
@@ -27,7 +30,6 @@ post_install() {
 }
 
 s6-doc_package() {
-	archs=noarch
 	short_desc="Documentation for s6"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {