diff --git a/multipath-tools/PKGBUILD b/multipath-tools/PKGBUILD
index b0d178e703..1e8864c597 100644
--- a/multipath-tools/PKGBUILD
+++ b/multipath-tools/PKGBUILD
@@ -9,9 +9,9 @@
 # Contributor: Matt Heagney <matt@heagney.com>
 
 pkgname=multipath-tools
-_tag='f3004b45e7f8266a3f00b146d4742821d04b7940' # git rev-parse ${pkgver}
-pkgver=0.9.6
-pkgrel=1
+_tag='6bb7330fca4a85c4f5abab0f9de5bd3519923f0a' # git rev-parse ${pkgver}
+pkgver=0.9.7
+pkgrel=4
 pkgdesc='Multipath tools for Linux (including kpartx)'
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
 url='https://github.com/opensvc/multipath-tools'
@@ -21,13 +21,21 @@ makedepends=('git' 'systemd')
 source=("multipath-tools::git+https://github.com/opensvc/multipath-tools#tag=${_tag}")
 sha256sums=('SKIP')
 
+_make_opts=(
+  prefix='/usr/'
+  bindir='/usr/bin'
+  etc_prefix=""
+  configfile='/etc/multipath.conf'
+  statedir='/etc/multipath'
+  LIB='lib'
+)
+
+
 build() {
   cd "${pkgname}"
 
   make \
-    prefix='/usr/' \
-    bindir='/usr/bin' \
-    LIB='lib' \
+    "${_make_opts[@]}" \
     FORTIFY_OPT=''
 }
 
@@ -35,10 +43,8 @@ package() {
   cd "${pkgname}"
 
   make -j1 \
+    "${_make_opts[@]}" \
     DESTDIR="${pkgdir}" \
-    prefix='/usr/' \
-    bindir='/usr/bin' \
-    LIB='lib' \
     install
 
   install -D -m0644 -t "${pkgdir}/usr/share/doc/${pkgname}" README*