diff --git a/_service b/_service
index a856640..7034593 100644
--- a/_service
+++ b/_service
@@ -1,7 +1,7 @@
 <services>
   <service name="tar_scm" mode="disabled">
     <param name="scm">git</param>
-    <param name="url">https://github.com/hreinecke/multipath-tools.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">0.6.2+suse%cd.%h</param>
diff --git a/_servicedata b/_servicedata
index b068826..fb2c120 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,6 @@
 <servicedata>
   <service name="tar_scm">
-    <param name="url">https://github.com/hreinecke/multipath-tools.git</param>
-    <param name="changesrevision">d93a87fc646ea7a1d6871672f2b59cccfccafdf3</param>
+    <param name="url">https://github.com/openSUSE/multipath-tools.git</param>
+    <param name="changesrevision">a385ea71b55a1ecb01afc121c372b1b9964b0744</param>
   </service>
 </servicedata>
diff --git a/multipath-tools-0.6.2+suse20160908.d93a87f.tar.xz b/multipath-tools-0.6.2+suse20160908.d93a87f.tar.xz
deleted file mode 100644
index c9c9c49..0000000
--- a/multipath-tools-0.6.2+suse20160908.d93a87f.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eb819101c13978f9a6d8628b3e2c52519b1aec2bf35745e4173e904a2c029e1e
-size 188400
diff --git a/multipath-tools-0.6.2+suse20160919.a385ea7.tar.xz b/multipath-tools-0.6.2+suse20160919.a385ea7.tar.xz
new file mode 100644
index 0000000..783ff10
--- /dev/null
+++ b/multipath-tools-0.6.2+suse20160919.a385ea7.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5a2dad0c865f4a5d165fab1ab6a2a3e3bdeddb38861c339016c420f663bf712b
+size 188388
diff --git a/multipath-tools.changes b/multipath-tools.changes
index e5df718..651f47e 100644
--- a/multipath-tools.changes
+++ b/multipath-tools.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Sep 19 10:55:20 CEST 2016 - hare@suse.de
+
+- libmultipath: Do not crash on empty features (bsc#994812)
+- multipathd: Set CLI timeout correctly (bsc#999061)
+- Moved multipath-tools repository to
+  github.com:/openSUSE/multipath-tools.git
+
 -------------------------------------------------------------------
 Thu Sep  8 14:23:16 CEST 2016 - hare@suse.de
 
diff --git a/multipath-tools.spec b/multipath-tools.spec
index d7cd962..de8ea4c 100644
--- a/multipath-tools.spec
+++ b/multipath-tools.spec
@@ -16,7 +16,7 @@
 #
 
 
-%define version_unconverted 0.6.2+suse20160908.d93a87f
+%define version_unconverted 0.6.2+suse20160919.a385ea7
 
 Name:           multipath-tools
 BuildRequires:  device-mapper-devel
@@ -31,15 +31,13 @@ Url:            http://christophe.varoqui.free.fr/
 Requires:       device-mapper >= 1.2.78
 Requires:       kpartx
 PreReq:         %insserv_prereq %fillup_prereq coreutils grep
-Version:        0.6.2+suse20160908.d93a87f
+Version:        0.6.2+suse20160919.a385ea7
 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
 Source1:        multipath.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build