diff --git a/python-zope-component.spec b/python-zope-component.spec
index 3f08553..0d73a0b 100644
--- a/python-zope-component.spec
+++ b/python-zope-component.spec
@@ -18,7 +18,7 @@ Summary: %{summary}
 Name: python-%{pkgname}
 Epoch:   1
 Version: 4.1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: http://pypi.python.org/packages/source/z/%{modname}/%{modname}-%{version}.zip
 License: ZPLv2.1
 Group: Development/Libraries
@@ -26,8 +26,9 @@ BuildArch: noarch
 URL: http://pypi.python.org/pypi/zope.component
 
 BuildRequires: python2-devel
-BuildRequires: python-setuptools
-BuildRequires: python-sphinx
+BuildRequires: %{py2_namespace}-setuptools
+BuildRequires: %{py2_namespace}-sphinx
+BuildRequires: %{py2_namespace}-repoze-sphinx-autointerface
 
 # Python3
 BuildRequires: python3-pkgversion-macros
@@ -49,8 +50,9 @@ BuildRequires: python%{python3_other_pkgversion}-setuptools
 #BuildRequires: python-zope-testrunner
 
 %if %{py2_namespace} == python
-Requires: python-zope-interface
-Requires: python-zope-event
+%{?python_provide:%python_provide %{py2_namespace}-%{pkgname}}
+Requires: %{py2_namespace}-zope-interface
+Requires: %{py2_namespace}-zope-event
 %endif
 
 %description %{_description}
@@ -101,24 +103,9 @@ rm -rf %{modname}.egg-info
 %py3_other_build
 %endif
 
-# build Sphinx documents
-COPYRIGHT=`grep Author: PKG-INFO |sed -e 's/Author: //'`
-cat >src/zope/component/conf.py <<END
-templates_path = ['_templates']
-source_suffix = '.txt'
-master_doc = 'index'
-project = '%{modname}'
-copyright = '$COPYRIGHT'
-version = '%{version}'
-release = '%{version}'
-pygments_style = 'sphinx'
-html_static_path = ['_static']
-extensions = []
-END
-
-sphinx-build -b html src/zope/component/ html
-
-rm -fr html/{.buildinfo,.doctrees}
+# Docs
+make -C docs html
+rm -fr docs/_build/html/{.buildinfo,.doctrees}
 
 
 %install
@@ -131,6 +118,7 @@ rm -fr html/{.buildinfo,.doctrees}
 
 #%%check
 #export PYTHONPATH=$(pwd)
+#%%{__python2} setup.py -q test -q
 #%%{__python3} setup.py -q test -q
 #%%if 0%{?with_python3_other}
 #%%{__python3_other} setup.py -q test -q
@@ -141,7 +129,7 @@ rm -fr html/{.buildinfo,.doctrees}
 %defattr(-,root,root,-)
 %license LICENSE.txt COPYRIGHT.txt
 %doc CHANGES.rst README.rst
-%doc html/
+%doc docs/_build/html/
 %{python2_sitelib}/zope/component/
 %{python2_sitelib}/%{modname}-*.egg-info
 %{python2_sitelib}/%{modname}-*-nspkg.pth
@@ -150,7 +138,7 @@ rm -fr html/{.buildinfo,.doctrees}
 %files -n python%{python3_pkgversion}-%{pkgname}
 %license LICENSE.txt COPYRIGHT.txt
 %doc CHANGES.rst README.rst
-%doc html/
+%doc docs/_build/html/
 %{python3_sitelib}/zope/component/
 %exclude %{python3_sitelib}/zope/component/*.txt
 %{python3_sitelib}/%{modname}-*.egg-info
@@ -160,7 +148,7 @@ rm -fr html/{.buildinfo,.doctrees}
 %files -n python%{python3_other_pkgversion}-%{pkgname}
 %license LICENSE.txt COPYRIGHT.txt
 %doc CHANGES.rst README.rst
-%doc html/
+%doc docs/_build/html/
 %{python3_other_sitelib}/zope/component/
 %exclude %{python3_other_sitelib}/zope/component/*.txt
 %{python3_other_sitelib}/%{modname}-*.egg-info
@@ -169,6 +157,10 @@ rm -fr html/{.buildinfo,.doctrees}
 
 
 %changelog
+* Tue Apr 25 2017 Aurelien Bompard <abompard@fedoraproject.org> - 1:4.1.0-3
+- Use the included documentation.
+- Re-add the Requires for the python- subpackage.
+
 * Mon Apr 24 2017 Aurelien Bompard <abompard@fedoraproject.org> - 1:4.1.0-2
 - Enable creation of the Python 3 packages in EPEL, now that the dependencies
   are available.