diff --git a/python-pygit2.spec b/python-pygit2.spec
index b83ee6f..98dc2f6 100644
--- a/python-pygit2.spec
+++ b/python-pygit2.spec
@@ -1,12 +1,14 @@
-%if 0%{?fedora}
-%global with_python3 1
+%if 0%{?rhel} && 0%{?rhel} <= 7
+%bcond_with python3
+%else
+%bcond_without python3
 %endif
 
 %global pkgname pygit2
 
 Name:           python-%{pkgname}
 Version:        0.26.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python bindings for libgit2
 
 License:        GPLv2 with linking exception
@@ -22,7 +24,6 @@ BuildRequires:  openssl-devel
 pygit2 is a set of Python bindings to the libgit2 library, which implements
 the core of Git.
 
-
 %package -n python2-%{pkgname}
 Summary:        Python 2.x bindings for libgit2
 %{?python_provide:%python_provide python2-%{pkgname}}
@@ -40,8 +41,7 @@ the core of Git.
 
 Python 2 version.
 
-
-%if 0%{?with_python3}
+%if %{with python3}
 %package -n     python3-%{pkgname}
 Summary:        Python 3.x bindings for libgit2
 %{?python_provide:%python_provide python3-%{pkgname}}
@@ -60,33 +60,27 @@ the core of Git.
 Python 3 version.
 %endif
 
-
 %package        doc
 Summary:        Documentation for %{name}
 BuildArch:      noarch
-BuildRequires:  python-sphinx
+BuildRequires:  %{_bindir}/sphinx-build
 
 %description    doc
 Documentation for %{name}.
 
-
 %prep
 %autosetup -n %{pkgname}-%{version} -p1
 
-
 %build
 %py2_build
 make -C docs html
-
-%if 0%{?with_python3}
+%if %{with python3}
 %py3_build
 %endif
 
-
 %install
 %py2_install
-
-%if 0%{?with_python3}
+%if %{with python3}
 %py3_install
 %endif
 
@@ -95,15 +89,12 @@ find %{_builddir} -name '.buildinfo' -delete
 # Correct the permissions.
 find %{buildroot} -name '*.so' -exec chmod 755 {} ';'
 
-
 %check
 %{__python2} setup.py test
-
-%if 0%{?with_python3}
+%if %{with python3}
 %{__python3} setup.py test
 %endif
 
-
 %files -n python2-%{pkgname}
 %doc README.rst TODO.txt
 %license COPYING
@@ -111,7 +102,7 @@ find %{buildroot} -name '*.so' -exec chmod 755 {} ';'
 %{python2_sitearch}/%{pkgname}
 %{python2_sitearch}/_%{pkgname}.so
 
-%if 0%{?with_python3}
+%if %{with python3}
 %files -n python3-%{pkgname}
 %doc README.rst TODO.txt
 %license COPYING
@@ -124,12 +115,14 @@ find %{buildroot} -name '*.so' -exec chmod 755 {} ';'
 %license COPYING
 %doc docs/_build/html/*
 
-
 %changelog
+* Mon Nov 20 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.26.1-3
+- Fixup python3 conditionals
+
 * Mon Nov 20 2017 Pete Walter <pwalter@fedoraproject.org> - 0.26.1-2
 - Add back Python 3 conditionals
 
-* Mon Nov 20 2017 Pete Walter <pwalter@fedoraproject.org> - 0.26.1-1
+* Mon Nov 20 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.26.1-1
 - Update to 0.26.1
 
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.26.0-3