diff --git a/krita.changes b/krita.changes
index 6ffcf47..56b377e 100644
--- a/krita.changes
+++ b/krita.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun  2 10:07:03 UTC 2016 - lbeltrame@kde.org
+
+- Change conflicts to Obsoletes and Provides
+
 -------------------------------------------------------------------
 Wed Jun  1 18:54:48 UTC 2016 - wbauer@tmo.at
 
diff --git a/krita.spec b/krita.spec
index f7f5617..14ce4d8 100644
--- a/krita.spec
+++ b/krita.spec
@@ -88,7 +88,8 @@ BuildRequires:  pkgconfig(xinerama)
 BuildRequires:  pkgconfig(xorg-macros) >= 1.3
 BuildRequires:  pkgconfig(xrandr)
 Recommends:     create-resources
-Conflicts:      calligra-krita
+Obsoletes:      calligra-krita < %version
+Provides:       calligra-krita
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description