diff --git a/_service b/_service
index dda78e4..4d6ac9f 100644
--- a/_service
+++ b/_service
@@ -1,18 +1,18 @@
+<?xml version="1.0"?>
 <services>
-  <service name="obs_scm" mode="disabled">
+  <service name="obs_scm" mode="manual">
     <param name="scm">git</param>
     <param name="url">https://github.com/openSUSE/multipath-tools.git</param>
-    <param name="subdir"></param>
     <param name="filename">multipath-tools</param>
     <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@+suse.%h</param>
     <param name="revision">factory</param>
     <param name="match-tag">0.[0-9].[0-9]</param>
     <param name="changesgenerate">enable</param>
   </service>
-  <service mode="buildtime" name="tar" />
+  <service mode="manual" name="set_version"/>
+  <service mode="buildtime" name="tar"/>
   <service mode="buildtime" name="recompress">
     <param name="file">*.tar</param>
     <param name="compression">xz</param>
   </service>
-  <service name="set_version" mode="disabled"/>
 </services>
diff --git a/_servicedata b/_servicedata
index a70fef0..56a51c1 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/multipath-tools.git</param>
-              <param name="changesrevision">f11c1929ed6dc7bdcc5b699df1c397f298406eab</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">5a09bfa1d1b8cf3c282ed09a9af0f4804804476c</param></service></servicedata>
\ No newline at end of file
diff --git a/multipath-tools-0.8.6+32+suse.f11c192.obscpio b/multipath-tools-0.8.6+32+suse.f11c192.obscpio
deleted file mode 100644
index 64775b1..0000000
--- a/multipath-tools-0.8.6+32+suse.f11c192.obscpio
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9e7204aae31be30d9a2bc2d658eecdb8e1f10bace895d85c144f3592ab88aa7d
-size 2612236
diff --git a/multipath-tools-0.8.7+14+suse.5a09bfa.obscpio b/multipath-tools-0.8.7+14+suse.5a09bfa.obscpio
new file mode 100644
index 0000000..2b7158c
--- /dev/null
+++ b/multipath-tools-0.8.7+14+suse.5a09bfa.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f5600056dec991111e6591dc11e2d702bf87db8b93fcd67b86de363d3029091c
+size 2629132
diff --git a/multipath-tools.changes b/multipath-tools.changes
index 8033bf5..0cf5ce5 100644
--- a/multipath-tools.changes
+++ b/multipath-tools.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Sep 10 20:36:51 UTC 2021 - Martin Wilck <mwilck@suse.com>
+
+- Update to version  0.8.7+14+suse.5a09bfa1:
+  * Fix possible string overflows (bsc#1188148)
+
+- Upstream fixes / changes
+  * better string handling
+  * multipath: print warning if multipathd isn't running
+  * mpathpersist: better error msg when no usable paths exist
+  * fixes from 0.8.6+32+suse.f11c192 merged upstream
+  
 -------------------------------------------------------------------
 Fri Aug 13 11:03:13 UTC 2021 - Martin Wilck <mwilck@suse.com>
 
diff --git a/multipath-tools.obsinfo b/multipath-tools.obsinfo
index 341e486..c9874e6 100644
--- a/multipath-tools.obsinfo
+++ b/multipath-tools.obsinfo
@@ -1,5 +1,5 @@
 name: multipath-tools
-version: 0.8.6+32+suse.f11c192
-mtime: 1628784125
-commit: f11c1929ed6dc7bdcc5b699df1c397f298406eab
+version: 0.8.7+14+suse.5a09bfa
+mtime: 1631303142
+commit: 5a09bfa1d1b8cf3c282ed09a9af0f4804804476c
 
diff --git a/multipath-tools.spec b/multipath-tools.spec
index 2a50cfc..2c5e18a 100644
--- a/multipath-tools.spec
+++ b/multipath-tools.spec
@@ -29,7 +29,7 @@
 %define libdmmp_version %(echo %{_libdmmp_version} | tr . _)
 
 Name:           multipath-tools
-Version:        0.8.6+32+suse.f11c192
+Version:        0.8.7+14+suse.5a09bfa
 Release:        0
 Summary:        Tools to Manage Multipathed Devices with the device-mapper
 License:        GPL-2.0-only