diff --git a/rdma-core.changes b/rdma-core.changes
index cf089e2..73253c9 100644
--- a/rdma-core.changes
+++ b/rdma-core.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct  2 06:37:21 UTC 2019 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
+
+- Have rsocket conflicts with older librdmacm-tools (bsc#1137140)
+- Have librdmacm-utils obsolete and provide librdmacm-tools (bsc#1137138)
+
 -------------------------------------------------------------------
 Fri Sep  6 07:18:24 UTC 2019 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
 
diff --git a/rdma-core.spec b/rdma-core.spec
index f2de778..4b60fd1 100644
--- a/rdma-core.spec
+++ b/rdma-core.spec
@@ -339,7 +339,9 @@ librdmacm provides a userspace RDMA Communication Management API.
 
 %package -n rsocket
 Summary:        Preloadable library to turn the socket API RDMA-aware
+# Older librdmacm-tools used to provide rsocket
 Group:          System/Libraries
+Conflicts:      librdmacm-tools < 2
 
 %description -n rsocket
 Existing applications can make use of rsockets through the use this
@@ -349,6 +351,8 @@ manpage for details.
 %package -n librdmacm-utils
 Summary:        Examples for the librdmacm library
 Group:          Productivity/Networking/Other
+Obsoletes:      librdmacm-tools < %{version}
+Provides:       librdmacm-tools = %{version}
 
 %description -n librdmacm-utils
 Example test programs for the librdmacm library.