diff --git a/capstone.spec b/capstone.spec
index 1864f86..bc0caf0 100644
--- a/capstone.spec
+++ b/capstone.spec
@@ -1,6 +1,6 @@
 Name:           capstone
 Version:        3.0.4
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        A lightweight multi-platform, multi-architecture disassembly framework
 
 %global         gituser         aquynh
@@ -24,8 +24,9 @@ Source0:        https://github.com/%{gituser}/%{gitname}/archive/%{commit}/%{nam
 BuildRequires:  python2-devel
 BuildRequires:  jna
 BuildRequires:  java-devel
+
 %if 0%{?with_python3}
-BuildRequires:  python3-devel
+BuildRequires:  python%{python3_pkgversion}-devel
 %endif # if with_python3
 %global _hardened_build 1
 
@@ -45,9 +46,9 @@ developing applications that use %{name}.
 %package        -n python2-capstone
 %{?python_provide:%python_provide python2-capstone}
 # Remove before F30
-Provides: %{name}-python = %{version}-%{release}
-Provides: %{name}-python%{?_isa} = %{version}-%{release}
-Obsoletes: %{name}-python < %{version}-%{release}
+Provides:       %{name}-python = %{version}-%{release}
+Provides:       %{name}-python%{?_isa} = %{version}-%{release}
+Obsoletes:      %{name}-python < %{version}-%{release}
 Summary:        Python bindings for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
@@ -55,11 +56,20 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 The %{name}-python package contains python bindings for %{name}.
 
 %if 0%{?with_python3}
-%package	python3
+%package	-n python%{python3_pkgversion}-capstone
+%{?python_provide:%python_provide python%{python3_pkgversion}-capstone}
+# Remove before F30
+Provides:       %{name}-python%{python3_pkgversion} = %{version}-%{release}
+Provides:       %{name}-python%{python3_pkgversion}%{?_isa} = %{version}-%{release}
+Obsoletes:      %{name}-python%{python3_pkgversion} < %{version}-%{release}
+Summary:        Python bindings for %{name}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+
 Summary:	Python3 bindings for %{name}
 Requires:	%{name}%{?_isa} = %{version}-%{release}
 
-%description	python3
+%description	-n python%{python3_pkgversion}-capstone
 The %{name}-python3 package contains python3 bindings for %{name}.
 %endif # with_python3
 
@@ -142,7 +152,7 @@ make check LD_LIBRARY_PATH="`pwd`"
 %{python2_sitelib}/%{name}
 
 %if 0%{?with_python3}
-%files python3
+%files -n python%{python3_pkgversion}-capstone
 %{python3_sitelib}/*egg-info
 %{python3_sitelib}/%{name}
 %endif # _with_python3
@@ -151,6 +161,10 @@ make check LD_LIBRARY_PATH="`pwd`"
 %{_javadir}/
 
 %changelog
+* Tue Jun 26 2018 Michal Ambroz <rebus _AT seznam.cz> - 3.0.4-16
+- unify the naming convention for the python packages
+- fix the python3 package naming for EPEL7
+
 * Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 3.0.4-15
 - Rebuilt for Python 3.7