diff --git a/_service b/_service
deleted file mode 100644
index 8d61f80..0000000
--- a/_service
+++ /dev/null
@@ -1,15 +0,0 @@
-<services>
-  <service mode="disabled" name="tar_scm">
-    <param name="url">https://github.com/nathan-hoad/python-iwlib.git</param>
-    <param name="scm">git</param>
-    <param name="changesgenerate">enable</param>
-    <param name="filename">python-iwlib</param>
-    <param name="revision">master</param>
-    <param name="versionformat">1.5+%cd.%h</param>
-  </service>
-  <service mode="disabled" name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">xz</param>
-  </service>
-  <service mode="disabled" name="set_version"/>
-</services>
diff --git a/_servicedata b/_servicedata
deleted file mode 100644
index 73b9716..0000000
--- a/_servicedata
+++ /dev/null
@@ -1,4 +0,0 @@
-<servicedata>
-<service name="tar_scm">
-                <param name="url">https://github.com/nathan-hoad/python-iwlib.git</param>
-              <param name="changesrevision">e6676a7a0bbc9d800b2ee804a0f9701a97537b39</param></service></servicedata>
\ No newline at end of file
diff --git a/iwlib-1.6.2.tar.gz b/iwlib-1.6.2.tar.gz
new file mode 100644
index 0000000..a0f6ca3
--- /dev/null
+++ b/iwlib-1.6.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7496bcc3f7abb9b23071f83a86b4386fab41852d7ecc7aee05b6e42b832606f3
+size 54332
diff --git a/python-iwlib-1.5+20170811.73b7fd2.tar.xz b/python-iwlib-1.5+20170811.73b7fd2.tar.xz
deleted file mode 100644
index 2eaf193..0000000
--- a/python-iwlib-1.5+20170811.73b7fd2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:60ff59c376d5cbe47e352f7646799a1da5faefc5b6bcec5ae30d85ab7322e475
-size 11536
diff --git a/python-iwlib.changes b/python-iwlib.changes
index 2aa901e..e8b72fc 100644
--- a/python-iwlib.changes
+++ b/python-iwlib.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue May 14 11:42:59 UTC 2019 - Petr Cervinka <petr@cervinka.net>
+
+- Update to 1.6.2
+  * Added support for Python 3 (via migration to CFFI)
+  * Remove stub test build library from WIP testing code.
+- Run spec-cleaner
+- Migrated test execution to pytest
+- Applied workaround for PYTHONPATH issue in python-rpm-macros
+- Removed service files
+- Migrated source url from GitHub to PyPI
+
 -------------------------------------------------------------------
 Thu Mar  8 16:09:29 UTC 2018 - petr@cervinka.net
 
diff --git a/python-iwlib.spec b/python-iwlib.spec
index 7d44969..dab0ce1 100644
--- a/python-iwlib.spec
+++ b/python-iwlib.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-iwlib
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -12,22 +12,23 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-iwlib
-Version:        1.5+20170811.73b7fd2
+Version:        1.6.2
 Release:        0
 Summary:        Python module to interface with iwlib
 License:        GPL-2.0-only
 Group:          Development/Languages/Python
 URL:            https://github.com/nathan-hoad/python-iwlib
-Source:         python-iwlib-%{version}.tar.xz
-BuildRequires:  %{python_module devel}
-BuildRequires:  %{python_module setuptools}
+Source:         https://files.pythonhosted.org/packages/source/i/iwlib/iwlib-%{version}.tar.gz
 BuildRequires:  %{python_module cffi}
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module pytest}
+BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  libiw-devel
 BuildRequires:  python-rpm-macros
@@ -42,10 +43,9 @@ It provides scanning, setting the ESSID of a device, and getting the current con
 back from a device.
 
 %prep
-%setup -q -n python-iwlib-%{version}
+%setup -q -n iwlib-%{version}
 
 %build
-export CFLAGS="%{optflags}"
 %python_build
 
 %install
@@ -53,7 +53,9 @@ export CFLAGS="%{optflags}"
 %python_expand %fdupes %{buildroot}%{$python_sitearch}
 
 %check
-%python_exec setup.py test
+# Fix for https://github.com/openSUSE/python-rpm-macros/issues/31
+PYTHONPATH=FIX-ME
+%pytest_arch
 
 %files %{python_files}
 %license COPYING