diff --git a/python-jmespath.spec b/python-jmespath.spec
index 1c61801..3c22fbf 100644
--- a/python-jmespath.spec
+++ b/python-jmespath.spec
@@ -1,12 +1,7 @@
-%if 0%{?rhel}
-%global with_python3 0
-%{!?__python2: %global __python2 /usr/bin/python2}
-%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%{!?py2_build: %global py2_build %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} build --executable="%{__python2} -s"}}
-%{!?py2_install: %global py2_install %{expand: CFLAGS="%{optflags}" %{__python2} setup.py %{?py_setup_args} install -O1 --skip-build --root %{buildroot}}}
+%if 0%{?rhel} && 0%{?rhel} <= 7
+%bcond_with python3
 %else
-%global with_python3 1
+%bcond_without python3
 %endif
 
 %global pypi_name jmespath
@@ -21,7 +16,6 @@ URL:            https://github.com/jmespath/jmespath.py
 Source0:        https://pypi.python.org/packages/source/j/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 BuildArch:      noarch
 
-
 %description
 JMESPath allows you to declaratively specify how to extract elements from
 a JSON document.
@@ -38,7 +32,7 @@ BuildRequires:  python-setuptools
 JMESPath allows you to declaratively specify how to extract elements from
 a JSON document.
 
-%if 0%{?with_python3}
+%if %{with python3}
 %package -n     python3-%{pypi_name}
 Summary:        JSON Matching Expressions
 %{?python_provide:%python_provide python3-%{pypi_name}}
@@ -49,7 +43,7 @@ BuildRequires:  python3-setuptools
 %description -n python3-%{pypi_name}
 JMESPath allows you to declaratively specify how to extract elements from
 a JSON document.
-%endif # with_python3
+%endif # with python3
 
 %prep
 %setup -q -n %{pypi_name}-%{version}
@@ -57,16 +51,16 @@ rm -rf %{pypi_name}.egg-info
 
 %build
 %py2_build
-%if 0%{?with_python3}
+%if %{?with python3}
 %py3_build
-%endif # with_python3
+%endif # with python3
 
 %install
-%if 0%{?with_python3}
+%if %{with python3}
 %py3_install
 mv %{buildroot}/%{_bindir}/jp.py %{buildroot}/%{_bindir}/jp.py-%{python3_version}
 ln -sf %{_bindir}/jp.py-%{python3_version} %{buildroot}/%{_bindir}/jp.py-3
-%endif # with_python3
+%endif # with python3
 
 %py2_install
 mv %{buildroot}/%{_bindir}/jp.py %{buildroot}/%{_bindir}/jp.py-%{python2_version}
@@ -84,7 +78,7 @@ ln -sf %{_bindir}/jp.py-%{python2_version} %{buildroot}/%{_bindir}/jp.py
 %{python2_sitelib}/%{pypi_name}
 %{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
 
-%if 0%{?with_python3}
+%if %{with python3}
 %files -n python3-%{pypi_name}
 %doc README.rst
 %license LICENSE.txt
@@ -92,7 +86,7 @@ ln -sf %{_bindir}/jp.py-%{python2_version} %{buildroot}/%{_bindir}/jp.py
 %{_bindir}/jp.py-%{python3_version}
 %{python3_sitelib}/%{pypi_name}
 %{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
-%endif # with_python3
+%endif # with python3
 
 %changelog
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.0-5
@@ -104,10 +98,10 @@ ln -sf %{_bindir}/jp.py-%{python2_version} %{buildroot}/%{_bindir}/jp.py
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
-* Wed Jan 06 2016 Fabio Alessandro Locati <fabio@locati.cc> - 0.9.0-2
+* Wed Jan 06 2016 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.9.0-2
 - Improve to set the Provides tag for EL6 too
 
-* Tue Dec 29 2015 Fabio Alessandro Locati <fabio@locati.cc> - 0.9.0-1
+* Tue Dec 29 2015 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.9.0-1
 - Upgrade to upstream current version
 - Improve the spec file
 - Make possible to build in EL6