diff --git a/python-pyzmq.changes b/python-pyzmq.changes
index b59f08c..5d66e75 100644
--- a/python-pyzmq.changes
+++ b/python-pyzmq.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Aug 19 12:15:10 UTC 2011 - saschpe@suse.de
+
+- Update to version 2.1.7:
+  * Added proper GIL management for non-copying send
+  * Implemented support for zmq_errno().
+  * Added Socket.create_socket()
+  * Fixed setup.py to work with libzmq.dll on Window
+  * The flags argument to Socket.send/Socket.recv must be a C int
+    to prevent Python-C API calls in the nogil section.
+  * Added a protocol argument to pyobj_send that defaults to -1 (the
+    highest pickle protocol).
+  * Added a try/finally in Socket.recv.
+
 -------------------------------------------------------------------
 Sun Dec 12 15:40:57 UTC 2010 - saschpe@gmx.de
 
diff --git a/python-pyzmq.spec b/python-pyzmq.spec
index 5afa79f..0c21154 100644
--- a/python-pyzmq.spec
+++ b/python-pyzmq.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-pyzmq
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,53 +15,43 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-%define mod_name pyzmq
-
-Name:           python-%{mod_name}
-Version:        2.0.10
+Name:           python-pyzmq
+Version:        2.1.7
 Release:        0
 Url:            http://github.com/zeromq/pyzmq
-Summary:        Python bindings for 0MQ.
+Summary:        Python bindings for 0MQ
 License:        LGPL
 Group:          Development/Languages/Python
-Source:         %{mod_name}-%{version}.tar.bz2
+Source:         http://pypi.python.org/packages/source/p/pyzmq/pyzmq-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  python-devel zeromq-devel
+BuildRequires:  python-devel
+#BuildRequires:  python-matplotlib
+#BuildRequires:  python-Sphinx
+#BuildRequires:  python-xml
+BuildRequires:  zeromq-devel
 %if 0%{?suse_version}
 %py_requires
 %endif
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 %description
 PyZMQ is a lightweight and super-fast messaging library built on top of
 the ZeroMQ library (http://www.zeromq.org).
 
-Authors:
---------
-    Brian E. Granger <ellisonbg@gmail.com>
-
 %prep
-export CFLAGS="%{optflags}"
-%setup -n %{mod_name}-%{version}
+%setup -q -n pyzmq-%{version}
+sed -i "1d" zmq/{eventloop/stack_context,tests/test_{message,zmqstream,socket,error,stopwatch},log/handlers}.py
 
 %build
-python setup.py build
+CFLAGS="%{optflags}" python setup.py build
 
 %install
-python setup.py install --prefix=%{_prefix} --root=%{buildroot} %{?suse_version: --record-rpm=INSTALLED_FILES}
+python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+#cd docs && make html && rm build/html/.buildinfo # Build documentation and remove temporary files
 
-%clean
-rm -rf %{buildroot}
-
-%files %{?suse_version: -f INSTALLED_FILES}
+%files
 %defattr(-,root,root,-)
 %doc COPYING.LESSER README.rst examples docs
-%if 0%{!?suse_version:1}
-%python_sitearch/%{mod_name}*
-%python_sitearch/zmq*
-%endif
+%{python_sitearch}/*
 
 %changelog
diff --git a/pyzmq-2.0.10.tar.bz2 b/pyzmq-2.0.10.tar.bz2
deleted file mode 100644
index c1d1568..0000000
--- a/pyzmq-2.0.10.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3e39152c2f042c23a6af49751835d624581e6a1ace2708df2b21b2f8dacaca35
-size 367428
diff --git a/pyzmq-2.1.7.tar.gz b/pyzmq-2.1.7.tar.gz
new file mode 100644
index 0000000..a9f5f60
--- /dev/null
+++ b/pyzmq-2.1.7.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bcecc9e6d19e99757528f0957ab0fbb1ac5d9343820ad3386dcb3ca798cbf317
+size 550434