diff --git a/epiphany-branding-openSUSE.changes b/epiphany-branding-openSUSE.changes
index 19a7bab..c6b91f3 100644
--- a/epiphany-branding-openSUSE.changes
+++ b/epiphany-branding-openSUSE.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct  6 15:56:53 CEST 2008 - sbrabec@suse.cz
+
+- Conflict with other branding providers (FATE#304881).
+
 -------------------------------------------------------------------
 Thu Sep 11 02:18:59 CEST 2008 - vuntz@novell.com
 
diff --git a/epiphany-branding-openSUSE.spec b/epiphany-branding-openSUSE.spec
index 9057ab0..4bfdf67 100644
--- a/epiphany-branding-openSUSE.spec
+++ b/epiphany-branding-openSUSE.spec
@@ -21,13 +21,14 @@
 Name:           epiphany-branding-openSUSE
 License:        GPL v2 or later
 Version:        11.0
-Release:        29
+Release:        32
 Summary:        openSUSE branding of epiphany
 Group:          Productivity/Networking/Web/Browsers
 # PATCH-FEATURE-OPENSUSE opensuse-bookmarks.patch vuntz@novell.com -- Add openSUSE bookmarks
 Patch0:         opensuse-bookmarks.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       epiphany-branding = 2.22.2
+Conflicts:      otherproviders(epiphany-branding)
 Supplements:    packageand(epiphany:branding-openSUSE)
 BuildArch:      noarch
 # To be in sync with upstream defaults, do branding as a patch for upstream file.
@@ -67,6 +68,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/epiphany/chrome/branding/*
 
 %changelog
+* Mon Oct 06 2008 sbrabec@suse.cz
+- Conflict with other branding providers (FATE#304881).
 * Thu Sep 11 2008 vuntz@novell.com
 - Add more openSUSE bookmarks.
 - Clean up spec file.