diff --git a/main/nfs-utils/APKBUILD b/main/nfs-utils/APKBUILD
index e85eabc426f2d4fc0ac6265af1ded968163614dc..0b9e9069d9976e3d76e556f29db0d71e343b5690 100644
--- a/main/nfs-utils/APKBUILD
+++ b/main/nfs-utils/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=nfs-utils
 pkgver=2.6.4
-pkgrel=2
+pkgrel=3
 pkgdesc="kernel-mode NFS"
 url="https://linux-nfs.org/"
 arch="all"
@@ -155,7 +155,7 @@ f17b52bfaa2b344958c20123fc32186e83979a8b948373c12dee256de7d967991772e67b4206d1da
 82f0c131bc0b849ae7e5ed71bcff130cc341c84f26fa7fa97996b58b02b2193652aca2c59ac167e1c9be5899a77412f1755b2632b7d9744c98e4e4d20ea0821b  0004-gssd-handle-KRB5_AP_ERR_BAD_INTEGRITY-for-machine-cr.patch
 ca143dd227975d8c05c9e7e855e567a468681741bb78a0cf095059f0cf61a860c75153e8b579fcc97beaf6706b5d5297d31e74e329608fcee68696672d111396  0005-gssd-handle-KRB5_AP_ERR_BAD_INTEGRITY-for-user-crede.patch
 fcaf41a87c22fe39411266ab53e051625a15affdb29421a17a4d12dbb59ce849e8ad2bab7cbed22973b345880b3c55eaf9d518deb4dea4147d542ffa14bfa5d6  0006-configure-check-for-rpc_gss_seccreate.patch
-b7c2f8d0f8f7ff5fa59ef326432b3e063f52ccdf664fd2b4908adb8cac63bbfe12a60d3a75c4c3e893a0ff0fb6e8c726899d7b7245f1acd39efd5c2c29398e2d  nfs.initd
+485940f834430f919df97babe75670f12d90a565229f3d5edd0b7a4e2df10abdc8444010cafc2173c776804025ce342f98a89e91bd74b5fa3be56b46588c52da  nfs.initd
 89259b9f0878658d48792b5b2f42b43c966ed098dba1fecf9e07fb0de4aab37ad67655ea8dbcc2361ddab2b5013b2de35a03048a513aaeedf790e4b416a35a54  nfsmount.initd
 6e23897885cc33c49d9c7353b456585a1e0c7300822edba81bc48ba4ccc18297adce137260cc0aa9487aa5ef0aab3eecf931532cfa5bd40fd03bc9e0ddacfb28  nfsmount.confd
 414f2de0b64897b2350666760337683aa4bab612be3e5a3cdd3ac5afa55e498c5cb053430e35b7eb7ed66b93fd66d416d557c2bd8299e3b8b633c7935db6d422  rpc.gssd.initd
diff --git a/main/nfs-utils/nfs.initd b/main/nfs-utils/nfs.initd
index c88605bd1c408fd60e9de5d9d8636d84afb11cfe..d2a7bd7ef4e71e583818f0fab2b3267488bd646c 100644
--- a/main/nfs-utils/nfs.initd
+++ b/main/nfs-utils/nfs.initd
@@ -10,8 +10,8 @@ restarting=no
 
 # The binary locations
 exportfs=/usr/sbin/exportfs
-  mountd=/usr/sbin/rpc.mountd
-    nfsd=/usr/sbin/rpc.nfsd
+mountd=/usr/sbin/rpc.mountd
+nfsd=/usr/sbin/rpc.nfsd
 smnotify=/usr/sbin/sm-notify
 
 depend() {
@@ -110,13 +110,11 @@ stop() {
 	eend $?
 	ret=$((ret + $?))
 
-	# nfsd sets its process name to [nfsd] so don't look for $nfsd
 	ebegin "Stopping NFS daemon"
-	start-stop-daemon --stop --name nfsd --user root --signal 2
+	# Do not attempt to signal kernel nfsd threads directly, #924309
+	${nfsd} 0
 	eend $?
 	ret=$((ret + $?))
-	# in case things don't work out ... #228127
-	rpc.nfsd 0
 
 	# When restarting the NFS server, running "exportfs -ua" probably
 	# isn't what the user wants.  Running it causes all entries listed