diff --git a/python-pyzmq.changes b/python-pyzmq.changes
index dcc8c74..92fd449 100644
--- a/python-pyzmq.changes
+++ b/python-pyzmq.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Mar 27 09:32:34 UTC 2012 - saschpe@suse.de
+
+- Update to version 2.1.11:
+  * remove support for LABEL prefixes. A major feature of libzmq-3.0, the LABEL
+    prefix, has been removed from libzmq, prior to the first stable libzmq 3.x release.
+    * The prefix argument to ~.Socket.send_multipart remains, but it continue to behave in
+      exactly the same way as it always has on 2.1.x, simply prepending message parts.
+    * ~.Socket.recv_multipart will always return a list, because prefixes are once
+      again indistinguishable from regular message parts.
+  * add .Socket.poll method, for simple polling of events on a single socket.
+  * no longer require monkeypatching tornado IOLoop.  The :class:.ioloop.ZMQPoller class
+    is a poller implementation that matches tornado's expectations, and pyzmq sockets can
+    be used with any tornado application just by specifying the use of this poller. The
+    pyzmq IOLoop implementation now only trivially differs from tornado's.
+- Don't package documentation sources
+
 -------------------------------------------------------------------
 Tue Jan 31 16:20:35 UTC 2012 - saschpe@suse.de
 
@@ -14,6 +31,7 @@ Mon Dec  5 13:14:57 UTC 2011 - toddrme2178@gmail.com
 - Added python3 subpackage
 
 -------------------------------------------------------------------
+>>>>>>> .new
 Mon Sep 26 12:38:30 UTC 2011 - cfarrell@suse.com
 
 - license update: LGPL-3.0+
diff --git a/python-pyzmq.spec b/python-pyzmq.spec
index 9a803f5..a3ef19f 100644
--- a/python-pyzmq.spec
+++ b/python-pyzmq.spec
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           python-pyzmq
 Version:        2.1.11
 Release:        0
@@ -25,6 +26,7 @@ Url:            http://github.com/zeromq/pyzmq
 Source:         http://pypi.python.org/packages/source/p/pyzmq/pyzmq-%{version}.tar.gz
 BuildRequires:  python-devel
 BuildRequires:  zeromq-devel
+Suggests:       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)")}
@@ -47,7 +49,8 @@ python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING.LESSER README.rst examples docs
+%doc COPYING.LESSER README.rst examples
+#%%doc docs/build/html
 %{python_sitearch}/*
 
 %changelog
diff --git a/python3-pyzmq.spec b/python3-pyzmq.spec
index 5869f21..becd8f3 100644
--- a/python3-pyzmq.spec
+++ b/python3-pyzmq.spec
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           python3-pyzmq
 Version:        2.1.11
 Release:        0
@@ -25,8 +26,8 @@ Url:            http://github.com/zeromq/pyzmq
 Source:         http://pypi.python.org/packages/source/p/pyzmq/pyzmq-%{version}.tar.gz
 BuildRequires:  python3-devel
 BuildRequires:  zeromq-devel
-Requires:       python(abi) = %{py3_ver}
 Requires:       python3-base
+Requires:       python(abi) = %{py3_ver}
 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)")}