diff --git a/baselibs.conf b/baselibs.conf
index 54d9e40..147d7ce 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,2 +1,2 @@
-libdat2
+libdat2-2
 dapl-devel
diff --git a/dapl-debug.changes b/dapl-debug.changes
index 5356319..9dd43ea 100644
--- a/dapl-debug.changes
+++ b/dapl-debug.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Feb  4 14:33:06 UTC 2015 - dimstar@opensuse.org
+
+- Also have dapl-utils conflict with dapl-debug-utils.
+- Fix baselibs.conf to build libdat2-2-32bit.
+
+-------------------------------------------------------------------
+Mon Sep  8 07:46:08 UTC 2014 - coolo@suse.com
+
+- dapl-debug can't obsolete dapl or zypper will switch between the versions
+  all the time. They do conflict though
+
 -------------------------------------------------------------------
 Fri Aug  8 19:06:02 CEST 2014 - pth@suse.de
 
diff --git a/dapl-debug.spec b/dapl-debug.spec
index 593ca7c..5a4f7f4 100644
--- a/dapl-debug.spec
+++ b/dapl-debug.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dapl-debug
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -41,14 +41,8 @@ BuildRequires:  libibverbs-devel
 BuildRequires:  librdmacm-devel
 BuildRequires:  libtool
 
-%if "%name" == "dapl"
-Provides:       dapl-debug
-Obsoletes:      dapl-debug
-%endif
-
 %if "%name" == "dapl-debug"
-Provides:       dapl
-Obsoletes:      dapl
+Conflicts:      dapl
 %endif
 
 # bug437293
@@ -101,12 +95,10 @@ Summary:        Development files for the libdat and libdapl libraries
 Group:          Development/Libraries/Other
 Requires:       %{name} = %{version}
 Requires:       glibc-devel
-%if "%{name}" == "dapl-debug"
-Obsoletes:      dapl-devel
-Provides:       dapl-devel
+%if "%{name}" == "dapl"
+Conflicts:      dapl-debug-devel
 %else
-Obsoletes:      dapl-debug-devel
-Provides:       dapl-debug-devel
+Provides:       dapl-devel
 %endif
 
 %description    devel
@@ -132,6 +124,9 @@ library.
 Summary:        Test suites for the uDAPL library
 Group:          Productivity/Networking/System
 Requires:       %{name} = %{version}-%{release}
+%if "%{name}" == "dapl"
+Conflicts:      dapl-debug-utils
+%endif
 
 %description utils
 Useful test suites to validate the uDAPL library APIs.
diff --git a/dapl.changes b/dapl.changes
index 5356319..9dd43ea 100644
--- a/dapl.changes
+++ b/dapl.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Feb  4 14:33:06 UTC 2015 - dimstar@opensuse.org
+
+- Also have dapl-utils conflict with dapl-debug-utils.
+- Fix baselibs.conf to build libdat2-2-32bit.
+
+-------------------------------------------------------------------
+Mon Sep  8 07:46:08 UTC 2014 - coolo@suse.com
+
+- dapl-debug can't obsolete dapl or zypper will switch between the versions
+  all the time. They do conflict though
+
 -------------------------------------------------------------------
 Fri Aug  8 19:06:02 CEST 2014 - pth@suse.de
 
diff --git a/dapl.spec b/dapl.spec
index 6745e46..14598b3 100644
--- a/dapl.spec
+++ b/dapl.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package dapl
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -41,14 +41,8 @@ BuildRequires:  libibverbs-devel
 BuildRequires:  librdmacm-devel
 BuildRequires:  libtool
 
-%if "%name" == "dapl"
-Provides:       dapl-debug
-Obsoletes:      dapl-debug
-%endif
-
 %if "%name" == "dapl-debug"
-Provides:       dapl
-Obsoletes:      dapl
+Conflicts:      dapl
 %endif
 
 # bug437293
@@ -101,12 +95,10 @@ Summary:        Development files for the libdat and libdapl libraries
 Group:          Development/Libraries/Other
 Requires:       %{name} = %{version}
 Requires:       glibc-devel
-%if "%{name}" == "dapl-debug"
-Obsoletes:      dapl-devel
-Provides:       dapl-devel
+%if "%{name}" == "dapl"
+Conflicts:      dapl-debug-devel
 %else
-Obsoletes:      dapl-debug-devel
-Provides:       dapl-debug-devel
+Provides:       dapl-devel
 %endif
 
 %description    devel
@@ -132,6 +124,9 @@ library.
 Summary:        Test suites for the uDAPL library
 Group:          Productivity/Networking/System
 Requires:       %{name} = %{version}-%{release}
+%if "%{name}" == "dapl"
+Conflicts:      dapl-debug-utils
+%endif
 
 %description utils
 Useful test suites to validate the uDAPL library APIs.