diff --git a/zeromq.changes b/zeromq.changes
index cc5cb8f..75810f4 100644
--- a/zeromq.changes
+++ b/zeromq.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 28 11:40:21 UTC 2014 - tchvatal@suse.com
+
+- Split the curve-keygen binary to separate subpkg bnc#907584
+  * Add conflicts to new supackage
+
 -------------------------------------------------------------------
 Thu Nov 13 08:16:06 UTC 2014 - tchvatal@suse.com
 
diff --git a/zeromq.spec b/zeromq.spec
index 0c57b3d..535e480 100644
--- a/zeromq.spec
+++ b/zeromq.spec
@@ -52,6 +52,7 @@ protocols and more.
 %package -n %{lib_name}
 Summary:        Shared Library for ZeroMQ
 Group:          Productivity/Networking/Web/Servers
+Recommends:     %{name}-tools = %{version}
 
 %description -n %{lib_name}
 The 0MQ lightweight messaging kernel is a library which extends the
@@ -63,6 +64,24 @@ protocols and more.
 
 This package holds the shared library part of the ZeroMQ package.
 
+%package tools
+Summary:        Tools to work with ZeroMQ
+Group:          Productivity/Networking/Web/Servers
+# Conflict old libraries as we collide with them
+Conflicts:      libzmq1
+Conflicts:      libzmq2
+Conflicts:      libzmq3
+
+%description tools
+The 0MQ lightweight messaging kernel is a library which extends the
+standard socket interfaces with features traditionally provided by
+specialised messaging middleware products. 0MQ sockets provide an
+abstraction of asynchronous message queues, multiple messaging patterns,
+message filtering (subscriptions), seamless access to multiple transport
+protocols and more.
+
+This package contains the utilities to work with ZeroMQ library
+
 %package devel
 Summary:        Development files for ZeroMQ
 Group:          Development/Languages/C and C++
@@ -108,6 +127,11 @@ make check %{?_smp_mflags} || :
 %defattr(-,root,root,-)
 %doc COPYING COPYING.LESSER
 %{_libdir}/libzmq.so.*
+
+%files tools
+%defattr(-,root,root)
+%doc COPYING COPYING.LESSER
+%defattr(-,root,root,-)
 %{_bindir}/curve_keygen
 
 %files devel