diff --git a/testing/librespot/APKBUILD b/testing/librespot/APKBUILD
index f107bffc20b..f8b43fa8e1d 100644
--- a/testing/librespot/APKBUILD
+++ b/testing/librespot/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Michael Ekstrand <md@ekstrandom.net>
 pkgname=librespot
 pkgver=0.4.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Open Source Spotify client library"
 url="https://github.com/librespot-org/librespot"
 arch="all !s390x !riscv64" # limited by cargo
 license="MIT"
 options="!check" # no test suite
-makedepends="cargo>=1.53 alsa-lib-dev"
+makedepends="cargo alsa-lib-dev"
 install="$pkgname.pre-install"
 subpackages="$pkgname-openrc"
 source="librespot-$pkgver.tar.gz::https://github.com/librespot-org/librespot/archive/v$pkgver.tar.gz
@@ -16,13 +16,15 @@ source="librespot-$pkgver.tar.gz::https://github.com/librespot-org/librespot/arc
 	$pkgname.confd
 	"
 
+prepare() {
+	default_prepare
+
+	cargo fetch --locked
+}
+
 build() {
-	export CARGO_HOME="$srcdir"/cargo
-	export RUSTFLAGS="-C target-feature=-crt-static"
-	cargo build \
-		--release \
-		--features alsa-backend \
-		--verbose
+	cargo build --release --frozen \
+		--features alsa-backend
 }
 
 package() {
@@ -33,6 +35,6 @@ package() {
 
 sha512sums="
 62377c0c7b868a5414c3e62b5edcac118f83c0bf1e218c9aa6e8174c875ab63707fc1eef2e64188bf2aac2891cbbd4fddc086cb4b9b4a760ded20c63fe4f8ebe  librespot-0.4.2.tar.gz
-c48ea30e2bd076691a2f1e0e3f6c6329921a8cf25e4f39ca82e07aca5a1c2c519007f081f2b6bbd1566086407a52dce787450b840e8a07e3010227cefda0452a  librespot.initd
-4286a3d1cc9678af2f43074c30a0ab7a9f686301468a0fd435d37a62773f0d1501b7201851bef4237324a83361ad93531ceb512a42ee0a63d4d14677760f5ec5  librespot.confd
+c7cf6dd1afc67d02c710cd01baacee3084812cbf326514667c9b053fe0b4b7769fdac9f7fc4c2e3ee9755c6fe6d3b9bf4fda1279e507e0abd254157adf44d4c2  librespot.initd
+7be717bbe23b40d6c52b1e9b1ce4cb6d5f243b75ce5479a28fa3fff97f7e80f565321a839259ae7ee4eba47f490f1c0aec72b52e71d25620a98e4c7bcd696cde  librespot.confd
 "
diff --git a/testing/librespot/librespot.confd b/testing/librespot/librespot.confd
index ea74e317924..0cf3adad61b 100644
--- a/testing/librespot/librespot.confd
+++ b/testing/librespot/librespot.confd
@@ -1 +1,4 @@
 librespot_args=""
+
+# uncomment to use process supervisor
+#supervisor=supervise-daemon
diff --git a/testing/librespot/librespot.initd b/testing/librespot/librespot.initd
index 8a7e42ea68c..414526802b7 100644
--- a/testing/librespot/librespot.initd
+++ b/testing/librespot/librespot.initd
@@ -4,10 +4,15 @@ command=/usr/bin/librespot
 command_args="${librespot_args}"
 pidfile=/run/librespot.pid
 command_background=true
-logfile="/var/log/librespot.log"
-start_stop_daemon_args="--user ${librespot_user:-librespot} --group ${librespot_group:-audio} --stdout $logfile --stderr $logfile"
+command_user="${librespot_user:-librespot}:${librespot_group:-librespot}"
+output_log=/var/log/librespot.log
+error_log=/var/log/librespot.log
 
-depends() {
+depend() {
 	need localmount net
 	before firewall
 }
+
+start_pre() {
+	checkpath -f -o $command_user $output_log
+}
diff --git a/testing/librespot/librespot.pre-install b/testing/librespot/librespot.pre-install
index 203bd5edf41..272833101c7 100644
--- a/testing/librespot/librespot.pre-install
+++ b/testing/librespot/librespot.pre-install
@@ -1,5 +1,7 @@
 #!/bin/sh
 
-adduser -S -D -H -s /sbin/nologin -G audio -g audio librespot 2>/dev/null
+addgroup -S librespot 2>/dev/null
+adduser -S -D -H -s /sbin/nologin -G librespot -g librespot librespot 2>/dev/null
+addgroup librespot audio 2>/dev/null
 
 exit 0