diff --git a/python-sphinx.spec b/python-sphinx.spec
index 6ae6d95dff714d9ec2d051bec876ffda7d45253c..c83a6467cb818c7ddb5d62e49c1078112e9489c6 100644
--- a/python-sphinx.spec
+++ b/python-sphinx.spec
@@ -1,22 +1,15 @@
 Name:          python-sphinx
 Summary:       Python documentation generator
 Version:       1.7.6
-Release:       2
+Release:       3
 Epoch:         1
 License:       BSD and Public Domain and Python and (MIT or GPLv2)
 URL:           http://sphinx-doc.org/
 Source0:       https://files.pythonhosted.org/packages/source/S/Sphinx/Sphinx-%{version}.tar.gz
-Source1:       python2-sphinx
-Source2:       python3-sphinx
-Source3:       zz-modules-python-sphinx.sh
-Source4:       zz-modules-python-sphinx.csh
-Source5:       default-sphinx-command.in
-
+Source1:       default-sphinx-command.in
 Patch0001:     xfail-test_latex_remote_images.patch
 Patch0002:     sphinx-test_theming.diff
-
 BuildArch:     noarch
-
 BuildRequires: python2-devel >= 2.4 python2-babel python2-setuptools python2-docutils python2-jinja2 python2-pygments >= 2.0
 BuildRequires: python2-six python2-sphinx_rtd_theme python2-sphinx-theme-alabaster python2-imagesize python2-requests
 BuildRequires: python2-packaging python2-typing dos2unix python2-sphinxcontrib-websupport python2-html5lib python2-whoosh
@@ -243,14 +236,7 @@ done
 popd
 
 install -d %{buildroot}%{_modulesdir}/python-sphinx
-install -d %{buildroot}%{_sysconfdir}/profile.d
-install -m 0644 %{SOURCE1} %{buildroot}%{_modulesdir}/python-sphinx/
-install -m 0644 %{SOURCE2} %{buildroot}%{_modulesdir}/python-sphinx/
-install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
-install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
-sed -i 's|@python2_sphinx_dir@|%{_libexecdir}/python2-sphinx|' %{buildroot}%{_modulesdir}/python-sphinx/python2-sphinx
-sed -i 's|@python3_sphinx_dir@|%{_libexecdir}/python3-sphinx|' %{buildroot}%{_modulesdir}/python-sphinx/python3-sphinx
-sed    's/@PYTHONVER@/2/' < %{SOURCE5} > %{buildroot}%{_modulesdir}/python-sphinx/.version
+sed    's/@PYTHONVER@/2/' < %{SOURCE1} > %{buildroot}%{_modulesdir}/python-sphinx/.version
 
 for filename in sphinx-{build,apidoc,autogen,quickstart} ; do
   ln -s %{_libexecdir}/python2-sphinx/$filename %{buildroot}%{_bindir}/$filename
@@ -290,10 +276,7 @@ LANG=en_US.UTF-8 PYTHON=python3 make test
 %{python2_sitelib}/sphinx/
 %{python2_sitelib}/Sphinx-%{version}-py%{python2_version}.egg-info/
 %{_libexecdir}/python2-sphinx/
-%{_modulesdir}/python-sphinx/python2-sphinx
 %{_modulesdir}/python-sphinx/.version
-%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
-%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
 
 %files -n python3-sphinx
 %license LICENSE
@@ -302,9 +285,6 @@ LANG=en_US.UTF-8 PYTHON=python3 make test
 %{python3_sitelib}/sphinx/
 %{python3_sitelib}/Sphinx-%{version}-py%{python3_version}.egg-info/
 %{_libexecdir}/python3-sphinx/
-%{_modulesdir}/python-sphinx/python3-sphinx
-%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.sh
-%config(noreplace) %{_sysconfdir}/profile.d/zz-modules-python-sphinx.csh
 
 %files help
 %doc html reST
diff --git a/python2-sphinx b/python2-sphinx
deleted file mode 100644
index e015ae6dd83fae7258a53a72ef9b2678835fdeef..0000000000000000000000000000000000000000
--- a/python2-sphinx
+++ /dev/null
@@ -1,6 +0,0 @@
-#%Module 1.0
-#
-#  python2-sphinx module for use with 'environment modules' package
-#
-conflict        python-sphinx
-prepend-path    PATH            @python2_sphinx_dir@
diff --git a/python3-sphinx b/python3-sphinx
deleted file mode 100644
index 6d79fad0db61459c1026b8bb60ae195613faab8f..0000000000000000000000000000000000000000
--- a/python3-sphinx
+++ /dev/null
@@ -1,6 +0,0 @@
-#%Module 1.0
-#
-#  python2-sphinx module for use with 'environment modules' package
-#
-conflict        python-sphinx
-prepend-path    PATH            @python3_sphinx_dir@
diff --git a/zz-modules-python-sphinx.csh b/zz-modules-python-sphinx.csh
deleted file mode 100644
index d85799f9dba5c9a463bc7000a1af6d0ead0577aa..0000000000000000000000000000000000000000
--- a/zz-modules-python-sphinx.csh
+++ /dev/null
@@ -1,2 +0,0 @@
-# Add path to the default python-sphinx scripts on this version of Fedora
-module load python-sphinx >& /dev/null
diff --git a/zz-modules-python-sphinx.sh b/zz-modules-python-sphinx.sh
deleted file mode 100644
index af36d409e6b659bcda724cd427c0bc604dd64d92..0000000000000000000000000000000000000000
--- a/zz-modules-python-sphinx.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# Add path to the default python-sphinx scripts on this version of Fedora
-module load python-sphinx 2> /dev/null