diff --git a/usb-modeswitch-2.4.0.tar.bz2 b/usb-modeswitch-2.4.0.tar.bz2
deleted file mode 100644
index 3a82946..0000000
--- a/usb-modeswitch-2.4.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:17dc32bf10df8e370f2369b5137d34dfd8f2347faaa51524c5f21c922f42e212
-size 259433
diff --git a/usb-modeswitch-2.5.0.tar.bz2 b/usb-modeswitch-2.5.0.tar.bz2
new file mode 100644
index 0000000..126a76f
--- /dev/null
+++ b/usb-modeswitch-2.5.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:31c0be280d49a99ec3dc0be3325bef320d9c04b50714ef0ce1e36a614d687633
+size 260225
diff --git a/usb-modeswitch-data-20160612.tar.bz2 b/usb-modeswitch-data-20160612.tar.bz2
deleted file mode 100644
index 300253f..0000000
--- a/usb-modeswitch-data-20160612.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9c99c03a126ae98b373bacc8e78be6b88ee33e9439291fa59477a866832f6914
-size 30788
diff --git a/usb-modeswitch-data-20170120.tar.bz2 b/usb-modeswitch-data-20170120.tar.bz2
new file mode 100644
index 0000000..0ada573
--- /dev/null
+++ b/usb-modeswitch-data-20170120.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:172df3dfb6e211914bbeca074d1c9c849a35bdaafa63e42b72b784bf2992b3ad
+size 32439
diff --git a/usb_modeswitch.changes b/usb_modeswitch.changes
index b69591f..443186a 100644
--- a/usb_modeswitch.changes
+++ b/usb_modeswitch.changes
@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Sat Jan 28 22:39:32 UTC 2017 - joerg.lorenzen@ki.tng.de
+
+- Update to version 2.5.0
+  * ATTENTION: Parameter transmitted from udev now reduced to %k
+    (kernel name), however, rules file parameters can be '%b/%k' or
+    '%k' - this fixes issues with parameter handling by the systemd
+    unit file.
+  * Remove endpoint reset ahead of bulk message transmission, only
+    reset if endpoints are actually stalled, helping with quirky
+    device behaviour (see www.draisberghof.de/usb_modeswitch/bb/
+    viewtopic.php?f=2&t=2582 ).
+  * Stability fix by making a buffer in the config parser static,
+    preventing problems seen in Fedora (thanks to Lubomir Rintel
+    for patches and hints regarding the three previous issues).
+  * Removed premature driver unbinding in wrapper which could
+    disrupt certain devices already in target mode (reported by
+    Aleksander Morgado).
+  * Improved check for determining install mode (essential with
+    generic config files present, e.g. 12d1:#linux).
+- Update usb-modeswitch-data package to version 20170120.
+
+-------------------------------------------------------------------
+Fri Oct 28 14:33:42 UTC 2016 - joerg.lorenzen@ki.tng.de
+
+- Update usb-modeswitch-data package to version 20160803.
+- Added systemd as BuildRequires and fixed install of service file.
+
 -------------------------------------------------------------------
 Tue Sep 13 16:04:56 UTC 2016 - stefan.bruens@rwth-aachen.de
 
diff --git a/usb_modeswitch.spec b/usb_modeswitch.spec
index ba693ec..885d02c 100644
--- a/usb_modeswitch.spec
+++ b/usb_modeswitch.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package usb_modeswitch
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,10 +17,10 @@
 
 
 %define source_name	usb-modeswitch
-%define date		20160612
+%define date		20170120
 %define _udevdir %(pkg-config --variable=udevdir udev)
 Name:           usb_modeswitch
-Version:        2.4.0
+Version:        2.5.0
 Release:        0
 Summary:        A mode switching tool for controlling multiple-device USB gear
 License:        GPL-2.0+
@@ -35,6 +35,8 @@ BuildRequires:  pkg-config
 BuildRequires:  tcl
 BuildRequires:  pkgconfig(libusb-1.0)
 BuildRequires:  pkgconfig(udev)
+BuildRequires:  systemd
+%{?systemd_requires}
 Requires:       tcl >= 8.4
 Requires:       usb_modeswitch-data = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -68,7 +70,7 @@ CFLAGS="%{optflags}" make
 # The install target recreates usb_modeswitch_dispatcher, which is racy in respect to its
 # installation. install-common just uses the file from the build phase. boo#998641
 make DESTDIR=%{buildroot} install-common %{?_smp_mflags} UDEVDIR=%{buildroot}%{_udevdir}
-install --mode=444 -D -t %{buildroot}%{_unitdir} usb_modeswitch@.service
+install -Dm 444 usb_modeswitch@.service %{buildroot}%{_unitdir}/usb_modeswitch@.service
 
 cd %{source_name}-data-%{date}
 make DESTDIR=%{buildroot} install %{?_smp_mflags} RULESDIR=%{buildroot}%{_udevdir}/rules.d