diff --git a/kicad-gost.changes b/kicad-gost.changes
index 1d13aec..378a24a 100644
--- a/kicad-gost.changes
+++ b/kicad-gost.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar 25 23:27:53 UTC 2015 - jengelh@inai.de
+
+- Do not conflict with self-provides
+
 -------------------------------------------------------------------
 Tue Feb 25 12:47:03 UTC 2014 - dmitry_r@opensuse.org
 
diff --git a/kicad-gost.spec b/kicad-gost.spec
index e9ed5bf..1ea188a 100644
--- a/kicad-gost.spec
+++ b/kicad-gost.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package kicad
+# spec file for package kicad-gost
 #
-# 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
@@ -28,18 +28,21 @@ Name:           kicad
 %endif
 Version:        20140120
 Release:        0
-License:        GPL-2.0+
 %if 0%{?with_gost}
 Summary:        EDA software suite for the creation of schematics and PCB with GOST support
+License:        GPL-2.0+
+Group:          Productivity/Scientific/Electronics
 %else
 Summary:        EDA software suite for the creation of schematics and PCB
-%endif
+License:        GPL-2.0+
 Group:          Productivity/Scientific/Electronics
+%endif
 Url:            http://kicad-pcb.org
 # https://code.launchpad.net/~kicad-stable-committers/kicad/stable
 # revision 4027
 # bzr export -r [revision] kicad-[version].tar.bz2 lp:kicad/stable
 Source:         kicad-%{version}.tar.bz2
+Source9:        pre_checkin.sh
 Patch1:         kikad-no-templates-install.patch
 
 BuildRequires:  boost-devel
@@ -62,7 +65,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       kicad-library
 Recommends:     kicad-doc
 %if 0%{?with_gost}
-Conflicts:      kicad
+Conflicts:      otherproviders(kicad)
 Provides:       kicad = %{version}
 %endif
 
diff --git a/kicad.changes b/kicad.changes
index 1d13aec..378a24a 100644
--- a/kicad.changes
+++ b/kicad.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar 25 23:27:53 UTC 2015 - jengelh@inai.de
+
+- Do not conflict with self-provides
+
 -------------------------------------------------------------------
 Tue Feb 25 12:47:03 UTC 2014 - dmitry_r@opensuse.org
 
diff --git a/kicad.spec b/kicad.spec
index 4f79a80..b4b6ee4 100644
--- a/kicad.spec
+++ b/kicad.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package kicad
+# spec file for package kicad-gost
 #
-# 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
@@ -28,18 +28,21 @@ Name:           kicad
 %endif
 Version:        20140120
 Release:        0
-License:        GPL-2.0+
 %if 0%{?with_gost}
 Summary:        EDA software suite for the creation of schematics and PCB with GOST support
+License:        GPL-2.0+
+Group:          Productivity/Scientific/Electronics
 %else
 Summary:        EDA software suite for the creation of schematics and PCB
-%endif
+License:        GPL-2.0+
 Group:          Productivity/Scientific/Electronics
+%endif
 Url:            http://kicad-pcb.org
 # https://code.launchpad.net/~kicad-stable-committers/kicad/stable
 # revision 4027
 # bzr export -r [revision] kicad-[version].tar.bz2 lp:kicad/stable
 Source:         kicad-%{version}.tar.bz2
+Source9:        pre_checkin.sh
 Patch1:         kikad-no-templates-install.patch
 
 BuildRequires:  boost-devel
@@ -62,7 +65,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       kicad-library
 Recommends:     kicad-doc
 %if 0%{?with_gost}
-Conflicts:      kicad
+Conflicts:      otherproviders(kicad)
 Provides:       kicad = %{version}
 %endif
 
diff --git a/pre_checkin.sh b/pre_checkin.sh
new file mode 100644
index 0000000..3681b80
--- /dev/null
+++ b/pre_checkin.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+cp -f kicad.changes kicad-gost.changes