diff --git a/main/multipath-tools/APKBUILD b/main/multipath-tools/APKBUILD
index 636ce366fa7..f7400d41dce 100644
--- a/main/multipath-tools/APKBUILD
+++ b/main/multipath-tools/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=multipath-tools
 pkgver=0.9.7
-pkgrel=0
+pkgrel=1
 pkgdesc="Device Mapper Multipathing Driver"
 url="http://christophe.varoqui.free.fr/"
 arch="all"
@@ -23,6 +23,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/opensvc/multipath-tools/arch
 	multipath-tools.conf
 	multipath.initd
 	multipathd.initd
+	multipathd.confd
 	0001-Disable-Werror-and-O2.patch
 	"
 options="!check"
@@ -42,6 +43,8 @@ package() {
 		"$pkgdir"/etc/multipath.conf
 	install -D -m755 "$srcdir"/multipathd.initd \
 		"$pkgdir"/etc/init.d/multipathd
+	install -D -m644 "$srcdir"/multipathd.confd \
+		"$pkgdir"/etc/conf.d/multipathd
 	install -D -m755 "$srcdir"/multipath.initd \
 		"$pkgdir"/etc/init.d/multipath
 	install -D -m644 README.md \
@@ -51,7 +54,8 @@ package() {
 sha512sums="
 0f4c97179a3de5a0c77893fec229eb183293fed8e5e01a9945b261845ccf5d13f8ef2c2ff0c17c9345217d236275caed4765422ec95aed80821f11658bf96e26  multipath-tools-0.9.7.tar.gz
 e81462b22c0cbc92ea935d7544b9f9a0c4ccbcf13f3bc03dadf6de96407c9cf49964c9bbf02f12a134e1255c66421c6fde39d54b15eef975e8df81bdc88b2213  multipath-tools.conf
-97deeee57daee787d807da0a4dbf50baae047ddcda30925f7000ec822b5a17a3dc55196c3e032c8ffbc2caeac690ce5ca485b0a7c99f15e66bddaa000439112a  multipath.initd
-71933b27a9ed76d00766ee29e0583ccf08bd689805cf77e284bc318bae62ad7bcde1894b2e50993019462b0c9787eaa780b271244ff11ef52cca290604900343  multipathd.initd
+6176a4ed32711ff8e417a58ca0cad8279d46ba98ec40095dbdb1035c49c0f82b06b5affbe2b79c5f2020b215ebe31ebeb408509dc810f5d21eb757e88be8c99f  multipath.initd
+17853ca127259e129bbd61f24a830777d5b6d69f6500313fa62a0e0773de73387ce2c3a58a93a6182ee3d4891d1ec5fc2322cb674e787b326ef9cd8dcff5cbab  multipathd.initd
+2adc2b8322645fec8763a662614b5682294f81dc0f1b9cacace5e5ea62125aa80f4874c1b10f11619e79871087846a946f7a383c22953ca1fbaeb9ea021c5114  multipathd.confd
 f5699633be498cc78ed27c222334b9e5c7271b852f9e687991e425a27db74cd9c01198792fe5fc7f5dedf47fee9b577e8c4803f5b0323b10544f3678d5c6c714  0001-Disable-Werror-and-O2.patch
 "
diff --git a/main/multipath-tools/multipath.initd b/main/multipath-tools/multipath.initd
index fd2bd1d0e4f..4b0a1d498bc 100644
--- a/main/multipath-tools/multipath.initd
+++ b/main/multipath-tools/multipath.initd
@@ -1,5 +1,7 @@
 #!/sbin/openrc-run
 
+description="Initialize multipath"
+
 depend() {
 	before checkfs fsck multipathd iscsid lvm
 	after modules device-mapper
diff --git a/main/multipath-tools/multipathd.confd b/main/multipath-tools/multipathd.confd
new file mode 100644
index 00000000000..c77d68669fb
--- /dev/null
+++ b/main/multipath-tools/multipathd.confd
@@ -0,0 +1,4 @@
+# Configuration for /etc/init.d/multipathd
+
+# Comment out to run without process supervisor.
+supervisor="supervise-daemon"
diff --git a/main/multipath-tools/multipathd.initd b/main/multipath-tools/multipathd.initd
index ed5ec41e39a..92e982422b8 100644
--- a/main/multipath-tools/multipathd.initd
+++ b/main/multipath-tools/multipathd.initd
@@ -1,7 +1,10 @@
 #!/sbin/openrc-run
 
-supervisor=supervise-daemon
-command=/usr/sbin/multipathd
-command_args_foreground="-d"
-output_log=/var/log/${RC_SVCNAME}.log
-error_log=/var/log/${RC_SVCNAME}.log
+description="Multipath monitoring daemon"
+
+command="/usr/sbin/multipathd"
+command_args="-d $command_args"
+command_background="yes"
+pidfile="/run/$RC_SVCNAME.pid"
+output_log="/var/log/$RC_SVCNAME.log"
+error_log="/var/log/$RC_SVCNAME.log"