diff --git a/gfal2-python.spec b/gfal2-python.spec
index 789c8e8..84985db 100644
--- a/gfal2-python.spec
+++ b/gfal2-python.spec
@@ -48,8 +48,8 @@ BuildRequires:		boost-devel
 %if (0%{?fedora} && (0%{?fedora} <= 31)) || (0%{?rhel} && (0%{?rhel} <= 8))
 BuildRequires:          boost-python2-devel
 BuildRequires:		python2-devel
-%endif
 BuildRequires:		epydoc
+%endif
 
 # Python 3
 %if 0%{?with_python3} 
@@ -75,7 +75,6 @@ Provides: gfal2-python%{?_isa} = %{version}-%{release}
 Obsoletes: gfal2-python < %{version}-%{release}
 
 %description -n python2-gfal2 %_description
-%endif
 
 %package doc
 Summary:			Documentation for %{name}
@@ -83,8 +82,10 @@ Summary:			Documentation for %{name}
 BuildArch:			noarch
 %endif
 
+
 %description doc
 Documentation files for %{name}.
+%endif
 
 %if 0%{?with_python3}
 %package -n python3-gfal2
@@ -124,11 +125,15 @@ fi
      -DPYTHON2=TRUE \
 %else
      -DPYTHON2=FALSE \
+     -SKIP_DOC=TRUE  \
 %endif
      -DUNIT_TESTS=TRUE .
 
 make %{?_smp_mflags}
+
+%if (0%{?fedora} && (0%{?fedora} <= 31)) || (0%{?rhel} && (0%{?rhel} <= 8))
 make doc
+%endif
 
 %check
 ctest -V -T Test .
@@ -143,7 +148,6 @@ make DESTDIR=%{buildroot} install
 %{_pkgdocdir}/LICENSE
 %{_pkgdocdir}/RELEASE-NOTES
 %{_pkgdocdir}/README
-%endif
 
 %files doc
 %{_pkgdocdir}/readme.html
@@ -151,6 +155,7 @@ make DESTDIR=%{buildroot} install
 %dir %{_pkgdocdir}/examples
 %{_pkgdocdir}/html/*
 %{_pkgdocdir}/examples/*
+%endif
 
 %if 0%{?with_python3}
 %files -n python3-gfal2