diff --git a/_service b/_service
index 878309a..ba58a3f 100644
--- a/_service
+++ b/_service
@@ -4,11 +4,13 @@
     <param name="url">https://github.com/hreinecke/multipath-tools.git</param>
     <param name="subdir"></param>
     <param name="filename">multipath-tools</param>
-    <param name="version">0.6.1</param>
+    <param name="versionformat">0.6.1+suse%cd.%h</param>
     <param name="revision">sles12-sp2</param>
+    <param name="changesgenerate">enable</param>
   </service>
   <service name="recompress" mode="disabled">
     <param name="file">*multipath-tools*.tar</param>
     <param name="compression">xz</param>
   </service>
+  <service name="set_version" mode="disabled"/>
 </services>
diff --git a/_servicedata b/_servicedata
new file mode 100644
index 0000000..74b5401
--- /dev/null
+++ b/_servicedata
@@ -0,0 +1,4 @@
+<servicedata>
+<service name="tar_scm">
+            <param name="url">https://github.com/hreinecke/multipath-tools.git</param>
+          <param name="changesrevision">6e5239869eabaad4dced2152488f5a865509e1d1</param></service></servicedata>
diff --git a/multipath-tools-0.6.1+suse20160704.6e52398.tar.xz b/multipath-tools-0.6.1+suse20160704.6e52398.tar.xz
new file mode 100644
index 0000000..d5ef863
--- /dev/null
+++ b/multipath-tools-0.6.1+suse20160704.6e52398.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ba15bb1400d7f4609c688e0aa3ec074e4b6a79973f6e9a5ed0db1d5ba438da40
+size 188320
diff --git a/multipath-tools-0.6.1.tar.xz b/multipath-tools-0.6.1.tar.xz
deleted file mode 100644
index 2141a60..0000000
--- a/multipath-tools-0.6.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8f15d080565165861e5cfffed25ed58fa9fe500579aa692a8b844e9d9ee66afa
-size 190924
diff --git a/multipath-tools.changes b/multipath-tools.changes
index 79f0194..d8dd31a 100644
--- a/multipath-tools.changes
+++ b/multipath-tools.changes
@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Mon Jul  4 22:30:43 UTC 2016 - jengelh@inai.de
+
+- Remove obsoletes spec sections
+
+-------------------------------------------------------------------
+Mon Jul  4 09:47:21 CEST 2016 - hare@suse.de
+
+- Move config accesses to use user-space RCU (bsc#987526)
+  * Revert 'move filter_devnode under vector lock'
+  * Revert the rework patch
+- Include patches from upstream:
+  * Update hardware tables
+  * Update kpartx manpage
+  * Whitespace fixes
+  * Include coverity fixes
+  * Drop AUTHOR file
+- Update tarball to 0.6.1+suse20160704.6e52398
+
+-------------------------------------------------------------------
+Wed Jun  8 08:33:48 UTC 2016 - lnussel@suse.de
+
+- fix service file to not pretend that this is the upstream version.
+  Now labeled 0.6.1+suse20160603.9b920e3
+- Fix BuildRequire to get systemd.pc from correct package (bsc#983167)
+- point rcmultipathd to /usr/sbin/service to avoid dangling symlink warning
+
 -------------------------------------------------------------------
 Fri Jun  3 08:58:52 CEST 2016 - hare@suse.de
 
diff --git a/multipath-tools.spec b/multipath-tools.spec
index 2e8f277..9de8fec 100644
--- a/multipath-tools.spec
+++ b/multipath-tools.spec
@@ -16,24 +16,30 @@
 #
 
 
+%define version_unconverted 0.6.1+suse20160704.6e52398
+
 Name:           multipath-tools
 BuildRequires:  device-mapper-devel
 BuildRequires:  libaio-devel
 BuildRequires:  libudev-devel
+BuildRequires:  liburcu-devel
 BuildRequires:  readline-devel
-BuildRequires:  systemd-devel
 BuildRequires:  udev
+BuildRequires:  pkgconfig(libsystemd)
+BuildRequires:  pkgconfig(systemd)
 Url:            http://christophe.varoqui.free.fr/
 Requires:       device-mapper >= 1.2.78
 Requires:       kpartx
 PreReq:         %insserv_prereq %fillup_prereq coreutils grep
-Version:        0.6.1
+Version:        0.6.1+suse20160704.6e52398
 Release:        0
 Summary:        Tools to Manage Multipathed Devices with the device-mapper
 License:        GPL-2.0
 Group:          System/Base
 %{?systemd_requires}
 %define has_systemd 1
+#FIXME: https://github.com/hreinecke/multipath-tools.git needs to
+#be moved to SUSE namespace
 Source:         multipath-tools-%{version}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %suse_version > 1220
@@ -57,12 +63,6 @@ are:
 - kpartx: maps linear devmaps to device partitions, which makes
 multipath maps partionable
 
-
-
-Authors:
---------
-    Christophe Varoqui <christophe.varoqui@free.fr>
-
 %package -n kpartx
 Summary:        Manages partition tables on device-mapper devices
 Group:          System/Base
@@ -72,12 +72,6 @@ Requires:       device-mapper
 The kpartx program maps linear devmaps to device partitions, which
 makes multipath maps partionable.
 
-
-
-Authors:
---------
-    Christophe Varoqui <christophe.varoqui@free.fr>
-
 %package devel
 Summary:        Development libraries for multipath-tools
 Group:          Development/Libraries/Other
@@ -87,11 +81,6 @@ Requires:       device-mapper
 This package contains the development libraries for multipath-tools
 and libmpath_persist.
 
-
-Authors:
---------
-    Christophe Varoqui <christophe.varoqui@free.fr>
-
 %prep
 %setup -q -n multipath-tools-%{version}
 
@@ -104,10 +93,7 @@ mkdir -p $RPM_BUILD_ROOT/var/cache/multipath/
 rm $RPM_BUILD_ROOT/%_lib/libmpathpersist.so
 rm $RPM_BUILD_ROOT/%_lib/libmpathcmd.so
 mkdir -p $RPM_BUILD_ROOT/usr/sbin
-ln -sf /sbin/service $RPM_BUILD_ROOT/usr/sbin/rcmultipathd
-
-%clean
-rm -rf $RPM_BUILD_ROOT;
+ln -sf /usr/sbin/service $RPM_BUILD_ROOT/usr/sbin/rcmultipathd
 
 %pre
 [ -f /.buildenv ] && exit 0
@@ -142,7 +128,7 @@ exit 0
 
 %files
 %defattr(-,root,root)
-%doc AUTHOR COPYING README ChangeLog
+%doc COPYING README ChangeLog
 %{_udevrulesdir}/11-dm-mpath.rules
 %{_udevrulesdir}/56-multipath.rules
 /%{_lib}/libmultipath.so.0