diff --git a/baselibs.conf b/baselibs.conf
index 3faa838..33a9192 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -7,3 +7,6 @@ libpng16-devel
 libpng16-compat-devel
  requires -libpng16-compat-<targettype>
  requires "libpng16-devel-<targettype> = <version>"
+ conflicts "libpng-devel-<targettype>"
+ provides: "libpng-devel-<targettype>"
+
diff --git a/libpng16.changes b/libpng16.changes
index 587a354..c824043 100644
--- a/libpng16.changes
+++ b/libpng16.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr  2 13:35:08 UTC 2013 - pgajdos@suse.com
+
+- conflict with libpng12-compat-devel-32bit and libpng15-compat-devel-32bit
+
 -------------------------------------------------------------------
 Thu Mar 28 08:12:03 UTC 2013 - pgajdos@suse.com