diff --git a/python-sphinxcontrib-asyncio.changes b/python-sphinxcontrib-asyncio.changes
index 5e0510c..6cf3a7d 100644
--- a/python-sphinxcontrib-asyncio.changes
+++ b/python-sphinxcontrib-asyncio.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Sep 18 22:29:06 UTC 2017 - toddrme2178@gmail.com
+
+- Use new python-sphinxcontrib package to provide namespace
+  directory.
+
+-------------------------------------------------------------------
+Mon Sep 18 16:33:47 UTC 2017 - toddrme2178@gmail.com
+
+- Fix conflicts with python-Sphinx
+
 -------------------------------------------------------------------
 Thu Aug 24 10:04:34 UTC 2017 - sebix+novell.com@sebix.at
 
diff --git a/python-sphinxcontrib-asyncio.spec b/python-sphinxcontrib-asyncio.spec
index 1fa25ce..3418891 100644
--- a/python-sphinxcontrib-asyncio.spec
+++ b/python-sphinxcontrib-asyncio.spec
@@ -16,7 +16,7 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%bcond_without test
+%bcond_with     test
 Name:           python-sphinxcontrib-asyncio
 Version:        0.2.0
 Release:        0
@@ -25,16 +25,18 @@ Summary:        Sphinx extension to support coroutines in markup
 Url:            https://github.com/aio-libs/sphinxcontrib-asyncio
 Group:          Development/Languages/Python
 Source:         https://files.pythonhosted.org/packages/source/s/sphinxcontrib-asyncio/sphinxcontrib-asyncio-%{version}.tar.gz
-BuildRequires:  python-rpm-macros
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module sphinxcontrib}
 BuildRequires:  fdupes
+BuildRequires:  python-rpm-macros
 BuildRequires:  python3-Sphinx
-# SECTION test requirements
 %if %{with test}
+BuildRequires:  %{python_module Sphinx}
 BuildRequires:  %{python_module pytest}
 %endif
-# /SECTION
+Requires:       python-Sphinx
+Requires:       python-sphinxcontrib
 BuildArch:      noarch
 
 %python_subpackages
@@ -56,8 +58,15 @@ popd
 %python_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
+# Remove sphinxcontrib namespace package files provided by python-Sphinx
+%python_expand rm -f %{buildroot}%{$python_sitelib}/sphinxcontrib/__init__.py*
+%python_expand rm -f %{buildroot}%{$python_sitelib}/sphinxcontrib/__pycache__/__init__*.py*
+
 %files %{python_files}
 %doc CHANGES.rst README.rst docs/_build/html
-%{python_sitelib}/*
+%{python_sitelib}/sphinxcontrib/asyncio.py*
+%pycache_only %dir %{python_sitelib}/sphinxcontrib/__pycache__/
+%pycache_only %{python_sitelib}/sphinxcontrib/__pycache__/asyncio*.py*
+%{python_sitelib}/sphinxcontrib_asyncio-%{version}-py*.egg-info
 
 %changelog