diff --git a/do_not_install_tests.patch b/do_not_install_tests.patch
new file mode 100644
index 0000000..d1acd4c
--- /dev/null
+++ b/do_not_install_tests.patch
@@ -0,0 +1,15 @@
+---
+ setup.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: pyudev-0.17/setup.py
+===================================================================
+--- pyudev-0.17.orig/setup.py
++++ pyudev-0.17/setup.py
+@@ -52,5 +52,5 @@ setuptools.setup(
+         'Topic :: System :: Hardware',
+         'Topic :: System :: Operating System Kernels :: Linux',
+         ],
+-    packages=setuptools.find_packages(),
++    packages=setuptools.find_packages(exclude=['tests.*', 'tests']),
+     )
diff --git a/python-pyudev.changes b/python-pyudev.changes
index 633b201..26808a8 100644
--- a/python-pyudev.changes
+++ b/python-pyudev.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Wed Sep 23 18:44:41 UTC 2015 - asterios.dramis@gmail.com
+
+- Added a patch (do_not_install_tests.patch) to not install the
+  tests as a module (not needed). Fixes also file conflicts in
+  Factory.
+
+-------------------------------------------------------------------
+Tue Sep 15 05:47:44 UTC 2015 - hpj@urpla.net
+
+- Update to version 0.17:
+  * #52: Remove global libudev object
+  * #57: Really start the monitor on :meth:`pyudev.Monitor.poll()`
+  * #60: Do not use :meth:`select.select` to avoid hitting its file descriptor
+    limit
+  * #58: Force non-blocking IO in :class:`pyudev.Monitor` to avoid blocking on
+    receiving the device
+  * #63: Set proper flags on pipe fds.
+  * #65: Handle irregular polling events properly.
+  * #50: Add :class:`pyudev.wx.MonitorObserver` and deprecate 
+    :class:`pyudev.wx.WxUDevMonitorObserver`
+  * #50: Add :class:`pyudev.glib.MonitorObserver` and deprecate 
+    :class:`pyudev.glib.GUDevMonitorObserver`
+  * #50: Add :class:`pyudev.pyqt4.MonitorObserver` and deprecate 
+    :class:`pyudev.pyqt4.QUDevMonitorObserver`
+  * #50: Add :class:`pyudev.pyside.MonitorObserver` and deprecate 
+    :class:`pyudev.pyside.QUDevMonitorObserver`
+  * Add a wrapper function to retry interruptible system calls.
+
 -------------------------------------------------------------------
 Thu Oct 24 11:12:59 UTC 2013 - speilicke@suse.com
 
diff --git a/python-pyudev.spec b/python-pyudev.spec
index a864e63..74abe3f 100644
--- a/python-pyudev.spec
+++ b/python-pyudev.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-pyudev
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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,13 +17,15 @@
 
 
 Name:           python-pyudev
-Version:        0.16.1
+Version:        0.17
 Release:        0
 Summary:        Udev bindings for Python
 License:        LGPL-2.1+
 Group:          Development/Libraries/Python
 Url:            http://pyudev.readthedocs.org/
 Source0:        http://pypi.python.org/packages/source/p/pyudev/pyudev-%{version}.tar.gz
+# PATCH-FIX-OPENSUSE do_not_install_tests.patch asterios.dramis@gmail.com -- Do not install the tests as a module
+Patch0:         do_not_install_tests.patch
 BuildRequires:  libudev-devel
 BuildRequires:  python-Sphinx
 BuildRequires:  python-devel
@@ -49,6 +51,7 @@ in modern linux systems.
 
 %prep
 %setup -q -n pyudev-%{version}
+%patch0 -p1
 # Disable intersphinx and issuetracker, we don't want to access the web during doc build:
 sed -i -e "s|'sphinx.ext.intersphinx',\\?||" -e "s|'sphinxcontrib.issuetracker',\\?||" doc/conf.py
 
diff --git a/pyudev-0.16.1.tar.gz b/pyudev-0.16.1.tar.gz
deleted file mode 100644
index 7ac9a32..0000000
--- a/pyudev-0.16.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:765d1c14bd9bd031f64e2612225621984cb2bbb8cbc0c03538bcc4c735ff1c95
-size 74953
diff --git a/pyudev-0.17.tar.gz b/pyudev-0.17.tar.gz
new file mode 100644
index 0000000..dcb81a7
--- /dev/null
+++ b/pyudev-0.17.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb6f3c1f231ab3d11d6afee6a4b925c855030314568d9c6760d138465a092e8d
+size 81364