diff --git a/python-pyzmq.changes b/python-pyzmq.changes
index 71f64b6..c1dfc46 100644
--- a/python-pyzmq.changes
+++ b/python-pyzmq.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Apr 14 22:51:00 UTC 2017 - toddrme2178@gmail.com
+
+- Update to 16.0.2
+- Rebase skip_test_tracker.patch.
+- Implement single-spec version.
+
 -------------------------------------------------------------------
 Tue Jan 26 11:42:18 UTC 2016 - toddrme2178@gmail.com
 
diff --git a/python-pyzmq.spec b/python-pyzmq.spec
index f18cdb1..20ff0c0 100644
--- a/python-pyzmq.spec
+++ b/python-pyzmq.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-pyzmq
 #
-# 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
@@ -16,31 +16,37 @@
 #
 
 
+# Disable tests, they are so slow that OBS thinks the build died.
+%bcond_with tests
+
+%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-pyzmq
-Version:        15.2.0
+Version:        16.0.2
 Release:        0
 Summary:        Python bindings for 0MQ
 License:        LGPL-3.0+ and BSD-3-Clause
 Group:          Development/Languages/Python
 Url:            http://github.com/zeromq/pyzmq
-Source:         https://pypi.python.org/packages/source/p/pyzmq/pyzmq-%{version}.tar.gz
+Source:         https://files.pythonhosted.org/packages/source/p/pyzmq/pyzmq-%{version}.tar.gz
 Source1:        python-pyzmq-rpmlintrc
 # PATCH-FIX-OPENSUSE skip_test_tracker.patch
 Patch1:         skip_test_tracker.patch
-BuildRequires:  python-Cython
-BuildRequires:  python-cffi
-BuildRequires:  python-devel
-BuildRequires:  python-gevent
-BuildRequires:  python-numpy
-BuildRequires:  python-paramiko
-BuildRequires:  python-pexpect
-BuildRequires:  python-py
-BuildRequires:  python-setuptools
-BuildRequires:  python-simplejson
-BuildRequires:  python-tornado
+BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
+BuildRequires:  %{python_module devel}
+BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module Cython}
+BuildRequires:  %{python_module cffi}
+BuildRequires:  %{python_module gevent}
+BuildRequires:  %{python_module numpy}
+BuildRequires:  %{python_module paramiko}
+BuildRequires:  %{python_module pexpect}
+BuildRequires:  %{python_module py}
+BuildRequires:  %{python_module simplejson}
+BuildRequires:  %{python_module tornado}
 BuildRequires:  zeromq-devel
 # Test requirements
-BuildRequires:  python-nose
+BuildRequires:  %{python_module nose}
 Requires:       python
 Recommends:     python-cffi
 Recommends:     python-gevent
@@ -52,9 +58,7 @@ Recommends:     python-tornado
 Recommends:     python-paramiko
 Recommends:     zeromq
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%endif
+%python_subpackages
 
 %description
 PyZMQ is a lightweight and super-fast messaging library built on top of
@@ -78,21 +82,24 @@ find examples zmq -name "*.py" -exec sed -i "s|#\!\/usr\/bin\/env python||" {} \
 %patch1
 
 %build
-CFLAGS="%{optflags}" python setup.py build
+export CFLAGS="%{optflags}"
+%python_build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+%python_install
+%python_expand %fdupes %{buildroot}%{$python_sitearch}
 
-# Disable tests, they are so slow that OBS thinks the build died.
-#%check
-## Remove non-deterministic authentication test
-## This fails to connect randomly
-# rm -rf zmq/tests/test_auth.py
-# 
-# pthon3 setup.py build_ext --inplace
-# python3 setup.py test
+%if %{with tests}
+%check
+# Remove non-deterministic authentication test
+# This fails to connect randomly
+rm -rf zmq/tests/test_auth.py
 
-%files
+%python_exec setup.py build_ext --inplace
+%python_exec setup.py test
+%endif
+
+%files %{python_files}
 %defattr(-,root,root,-)
 %doc AUTHORS.md COPYING.BSD COPYING.LESSER README.md examples docs
 %{python_sitearch}/zmq/
@@ -101,7 +108,7 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 %exclude %{python_sitearch}/zmq/backend/cffi/_verify.c
 %exclude %{python_sitearch}/zmq/backend/cffi/_cdefs.h
 
-%files devel
+%files %{python_files devel}
 %defattr(-,root,root,-)
 %{python_sitearch}/zmq/utils/*.h
 %{python_sitearch}/zmq/backend/cffi/_verify.c
diff --git a/pyzmq-15.2.0.tar.gz b/pyzmq-15.2.0.tar.gz
deleted file mode 100644
index 36a8845..0000000
--- a/pyzmq-15.2.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2dafa322670a94e20283aba2a44b92134d425bd326419b68ad4db8d0831a26ec
-size 1078561
diff --git a/pyzmq-16.0.2.tar.gz b/pyzmq-16.0.2.tar.gz
new file mode 100644
index 0000000..6d4d8dd
--- /dev/null
+++ b/pyzmq-16.0.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0322543fff5ab6f87d11a8a099c4c07dd8a1719040084b6ce9162bcdf5c45c9d
+size 1026531
diff --git a/skip_test_tracker.patch b/skip_test_tracker.patch
index 912d8ed..89c7ecf 100644
--- a/skip_test_tracker.patch
+++ b/skip_test_tracker.patch
@@ -1,10 +1,10 @@
 --- zmq/tests/test_socket.py.orig	2015-06-18 19:46:28.000000000 +0200
 +++ zmq/tests/test_socket.py	2015-09-08 17:34:13.309795000 +0200
-@@ -206,6 +206,7 @@
+@@ -216,6 +216,7 @@
      @skip_pypy
      def test_tracker(self):
          "test the MessageTracker object for tracking when zmq is done with a buffer"
 +        raise SkipTest("test_tracker test skiped")
          addr = 'tcp://127.0.0.1'
-         a = self.context.socket(zmq.PUB)
-         port = a.bind_to_random_port(addr)
+         # get a port:
+         sock = socket.socket()