diff --git a/python-pycxx.changes b/python-pycxx.changes
index e06cf59..b813670 100644
--- a/python-pycxx.changes
+++ b/python-pycxx.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Aug  9 10:12:35 UTC 2018 - tchvatal@suse.com
+
+- Add provides/obsoletes for python-CXX as pycxx is upstream name
+  and name used in Fedora/Debian so we rather stick with this one
+  and remove python-CXX
+
 -------------------------------------------------------------------
 Thu Aug  9 07:21:40 UTC 2018 - tchvatal@suse.com
 
diff --git a/python-pycxx.spec b/python-pycxx.spec
index a3d172f..3520564 100644
--- a/python-pycxx.spec
+++ b/python-pycxx.spec
@@ -18,6 +18,7 @@
 
 %global modname pycxx
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define oldpython python
 Name:           python-%{modname}
 Version:        7.0.3
 Release:        0
@@ -25,7 +26,6 @@ Summary:        Python extensions in C++
 License:        BSD-3-Clause
 Group:          Development/Libraries/Python
 URL:            http://CXX.sourceforge.net/
-# SVN version contains updates for Python3
 Source0:        http://downloads.sourceforge.net/cxx/%{modname}-%{version}.tar.gz
 Patch0:         python-pycxx-7.0.3-python37.patch
 Patch1:         python-pycxx-7.0.3-change-include-paths.patch
@@ -34,7 +34,15 @@ BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  gcc-c++
 BuildRequires:  python-rpm-macros
+Obsoletes:      python-cxx < %{version}
+Provides:       python-cxx = %{version}
+Obsoletes:      python-CXX < %{version}
+Provides:       python-CXX = %{version}
 BuildArch:      noarch
+%ifpython2
+Obsoletes:      %{oldpython}-cxx < %{version}
+Provides:       %{oldpython}-cxx = %{version}
+%endif
 %python_subpackages
 
 %description
@@ -46,6 +54,15 @@ of Python extension modules in C++.
 %package devel
 Summary:        Development files for %{modname} applications
 Group:          Development/Libraries/Python
+Requires:       %{name} = %{version}
+Obsoletes:      python-cxx-devel < %{version}
+Provides:       python-cxx-devel = %{version}
+Obsoletes:      python-CXX-devel < %{version}
+Provides:       python-CXX-devel = %{version}
+%ifpython2
+Obsoletes:      %{oldpython}-cxx-devel < %{version}
+Provides:       %{oldpython}-cxx-devel = %{version}
+%endif
 
 %description devel
 PyCXX is a set of classes to help create extensions of Python in the
@@ -63,12 +80,14 @@ of Python extension modules in C++.
 %install
 %python_install
 
-%files %{python_files devel}
+%files %{python_files}
 %license COPYRIGHT
 %doc README.html
+%{python_sitelib}/CXX*
+
+%files %{python_files devel}
 %python2_only %doc Doc/Python2/
 %python3_only %doc Doc/Python3/
-%{python_sitelib}/CXX*
 %python2_only %{_datadir}/python%{python2_bin_suffix}
 %python3_only %{_datadir}/python%{python3_bin_suffix}
 %{python_sysconfig_path include}