diff --git a/srcpkgs/s6-linux-utils/template b/srcpkgs/s6-linux-utils/template
index bf0417a2554..47603b3137e 100644
--- a/srcpkgs/s6-linux-utils/template
+++ b/srcpkgs/s6-linux-utils/template
@@ -1,17 +1,24 @@
 # Template file for 's6-linux-utils'
 pkgname=s6-linux-utils
 version=2.5.0.0
-revision=1
-build_style=gnu-configure
+revision=2
+build_style=configure
 makedepends="skalibs-devel"
-configure_args="--libdir=/usr/lib --includedir=/usr/include --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps --with-lib=${XBPS_CROSS_BASE}/usr/lib"
+configure_args="--libdir=/usr/lib --includedir=/usr/include
+ --with-sysdeps=${XBPS_CROSS_BASE}/usr/lib/skalibs/sysdeps
+ --with-lib=${XBPS_CROSS_BASE}/usr/lib --bindir=/usr/bin"
 short_desc="Minimalistic Linux-specific system utilities (s6-chroot, s6-mount etc.)"
 maintainer="Orphaned <orphan@voidlinux.eu>"
 license="ISC"
 homepage="https://skarnet.org/software/${pkgname}/"
+changelog="https://skarnet.org/software/s6-linux-utils/upgrade.html"
 distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz"
 checksum=78571574464c76fc623ef50dc14800138b4fd98c5fa877af6850fdd9c2f90213
 
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) makedepends+=" nsss-devel" configure_args+=" --enable-nsss" ;;
+esac
+
 post_install() {
 	vlicense COPYING
 	vdoc README