diff --git a/python-asn1crypto.spec b/python-asn1crypto.spec
index 3b3bef1..7d798f7 100644
--- a/python-asn1crypto.spec
+++ b/python-asn1crypto.spec
@@ -3,7 +3,7 @@
 
 Name:           python-%{pypi_name}
 Version:        0.22.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Fast Python ASN.1 parser and serializer
 
 License:        MIT
@@ -14,8 +14,8 @@ BuildArch:      noarch
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
 
-BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
+BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  python%{python3_pkgversion}-setuptools
 
 %description
 Fast ASN.1 parser and serializer with definitions for private keys,
@@ -31,11 +31,11 @@ Fast ASN.1 parser and serializer with definitions for private keys,
 public keys, certificates, CRL, OCSP, CMS, PKCS#3, PKCS#7, PKCS#8,
 PKCS#12, PKCS#5, X.509 and TSP.
 
-%package -n     python3-%{pypi_name}
+%package -n     python%{python3_pkgversion}-%{pypi_name}
 Summary:        %{summary}
-%{?python_provide:%python_provide python3-%{pypi_name}}
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}
 
-%description -n python3-%{pypi_name}
+%description -n python%{python3_pkgversion}-%{pypi_name}
 Fast ASN.1 parser and serializer with definitions for private keys,
 public keys, certificates, CRL, OCSP, CMS, PKCS#3, PKCS#7, PKCS#8,
 PKCS#12, PKCS#5, X.509 and TSP.
@@ -68,12 +68,15 @@ rm -rf %{pypi_name}.egg-info
 %{python2_sitelib}/%{pypi_name}
 %{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
 
-%files -n python3-%{pypi_name}
+%files -n python%{python3_pkgversion}-%{pypi_name}
 %doc
 %{python3_sitelib}/%{pypi_name}
 %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
 
 %changelog
+* Thu Aug 03 2017 Christian Heimes <cheimes@redhat.com> - 0.22.0-4
+- Modernize spec
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.22.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild