diff --git a/system/multipath-tools/0002-multipathd-add-ncurses-to-linker.patch b/system/multipath-tools/0002-multipathd-add-ncurses-to-linker.patch
index f68c4af0b3..2d452c5582 100644
--- a/system/multipath-tools/0002-multipathd-add-ncurses-to-linker.patch
+++ b/system/multipath-tools/0002-multipathd-add-ncurses-to-linker.patch
@@ -1,11 +1,11 @@
---- multipathd/Makefile.orig	2017-11-10 17:52:36.070562376 +0200
-+++ multipathd/Makefile	2017-11-10 18:10:47.854895039 +0200
-@@ -11,7 +11,7 @@ CFLAGS += $(BIN_CFLAGS) -I$(multipathdir
+--- multipathd/Makefile.orig	2021-09-08 11:49:01.000000000 +0200
++++ multipathd/Makefile	2021-12-05 23:47:00.654767573 +0100
+@@ -15,7 +15,7 @@
  LDFLAGS += $(BIN_LDFLAGS)
  LIBDEPS += -L$(multipathdir) -lmultipath -L$(mpathpersistdir) -lmpathpersist \
  	   -L$(mpathcmddir) -lmpathcmd -ludev -ldl -lurcu -lpthread \
 -	   -ldevmapper -lreadline
 +	   -ldevmapper -lreadline -lncurses
+ CFLAGS += $(shell $(PKGCONFIG) --modversion liburcu 2>/dev/null | \
+ 	awk -F. '{ printf("-DURCU_VERSION=0x%06x", 256 * ( 256 * $$1 + $$2) + $$3); }')
  
- ifdef SYSTEMD
- 	CFLAGS += -DUSE_SYSTEMD=$(SYSTEMD)
diff --git a/system/multipath-tools/multipath-tools.SlackBuild b/system/multipath-tools/multipath-tools.SlackBuild
index aeb07b6484..3324430d59 100644
--- a/system/multipath-tools/multipath-tools.SlackBuild
+++ b/system/multipath-tools/multipath-tools.SlackBuild
@@ -1,5 +1,6 @@
 #!/bin/bash
 # Copyright 2014,2018 Nikos Yotis <nikos.giotis@gmail.com>
+# Copyright 2021  Mario Preksavec, Zagreb, Croatia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,8 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=multipath-tools
-VERSION=${VERSION:-0.7.8}
-SRCNAM="index.html?p=multipath-tools%2F.git;a=snapshot;sf=tgz;h=refs%2Ftags%2F$VERSION"
+VERSION=${VERSION:-0.8.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -71,7 +71,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$SRCNAM
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 
 # Patch for slackware compatibility
@@ -110,7 +110,7 @@ chmod 644 $PKG/etc/multipath.conf.new
 # Docs
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  COPYING README README.alua $CWD/README.SLACKWARE \
+  COPYING README.alua README.md $CWD/README.SLACKWARE \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/multipath-tools/multipath-tools.info b/system/multipath-tools/multipath-tools.info
index 54ce6d7b3a..c43233c62c 100644
--- a/system/multipath-tools/multipath-tools.info
+++ b/system/multipath-tools/multipath-tools.info
@@ -1,8 +1,8 @@
 PRGNAM="multipath-tools"
-VERSION="0.7.8"
+VERSION="0.8.7"
 HOMEPAGE="http://christophe.varoqui.free.fr/"
-DOWNLOAD="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;sf=tgz;h=refs/tags/0.7.8"
-MD5SUM="f8d0faed2913bc725c107b4f84f22a3a"
+DOWNLOAD="https://github.com/opensvc/multipath-tools/archive/0.8.7/multipath-tools-0.8.7.tar.gz"
+MD5SUM="5374165735591fac16e9274426a3c56e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="liburcu"