diff --git a/python-networkx.spec b/python-networkx.spec
index 1d68a1e..71df97d 100644
--- a/python-networkx.spec
+++ b/python-networkx.spec
@@ -1,9 +1,5 @@
-# Building documentation requires pydata-sphinx-theme, which can no longer be
-# updated in Fedora and doesn't exist in RHEL/EPEL.
-%bcond_with doc
-
 Name:           python-networkx
-Version:        2.7.1
+Version:        2.8
 Release:        1%{?dist}
 Summary:        Creates and Manipulates Graphs and Networks
 License:        BSD
@@ -43,15 +39,12 @@ BuildRequires:  %{py3_dist pytest}
 BuildRequires:  %{py3_dist pytest-mpl}
 
 # Documentation
-BuildRequires:  %{py3_dist docutils}
-%endif
-
-%if %{with doc}
 BuildRequires:  python-pygraphviz-doc
 BuildRequires:  python3-docs
 BuildRequires:  python3-numpy-doc
 BuildRequires:  %{py3_dist cairocffi}
 BuildRequires:  %{py3_dist contextily}
+BuildRequires:  %{py3_dist docutils}
 BuildRequires:  %{py3_dist geopandas}
 BuildRequires:  %{py3_dist igraph}
 BuildRequires:  %{py3_dist libpysal}
@@ -63,6 +56,7 @@ BuildRequires:  %{py3_dist seaborn}
 BuildRequires:  %{py3_dist sphinx}
 BuildRequires:  %{py3_dist sphinx-gallery}
 BuildRequires:  %{py3_dist texext}
+BuildRequires:  sympy-doc
 BuildRequires:  tex(latex)
 BuildRequires:  tex-preview
 %endif
@@ -82,7 +76,7 @@ Recommends:     xdg-utils
 NetworkX is a Python 3 package for the creation, manipulation, and
 study of the structure, dynamics, and functions of complex networks.
 
-%if %{with doc}
+%if 0%{?rhel} == 0
 %package doc
 Summary:        Documentation for networkx
 Requires:       fontawesome5-fonts-all
@@ -91,9 +85,6 @@ Provides:       bundled(js-underscore)
 
 %description doc
 Documentation for networkx
-%else
-# This can be removed when F40 reaches EOL or the doc subpackage is brought back
-Obsoletes:      %{name}-doc < 2.7-1
 %endif
 
 %prep
@@ -108,23 +99,21 @@ for f in $(grep -FRl %{_bindir}/env .); do
   rm $f.orig
 done
 
-%if %{with doc}
+%if 0%{?rhel} == 0
 # Use local objects.inv for intersphinx
 sed -e 's|\("https://docs\.python\.org/3/", \)None|\1"%{_docdir}/python3-docs/html/objects.inv"|' \
     -e 's|\("https://numpy\.org/doc/stable/", \)None|\1"%{_docdir}/python3-numpy-doc/objects.inv"|' \
     -e 's|\("https://pygraphviz.github.io/documentation/stable/", \)None|\1"%{_docdir}/python-pygraphviz/html/objects.inv"|' \
+    -e 's|\("https://docs.sympy.org/latest/", \)None|\1"%{_docdir}/sympy-doc/html/objects.inv"|' \
     -i doc/conf.py
 %endif
 
 %build
 %pyproject_wheel
 
-%if %{with doc}
+%if 0%{?rhel} == 0
 # Build the documentation
 PYTHONPATH=%{pyproject_build_lib} make -C doc html
-%endif
-
-%if 0%{?rhel} == 0
 rst2html --no-datestamp README.rst README.html
 %endif
 
@@ -134,7 +123,7 @@ rst2html --no-datestamp README.rst README.html
 mv %{buildroot}%{_docdir}/networkx-%{version} ./installed-docs
 rm -f installed-docs/INSTALL.txt
 
-%if %{with doc}
+%if 0%{?rhel} == 0
 # Repack uncompressed zip archives
 for fil in $(find doc/build -name \*.zip); do
   mkdir zip
@@ -156,12 +145,16 @@ done
 %doc README.html installed-docs/*
 %endif
 
-%if %{with doc}
+%if 0%{?rhel} == 0
 %files doc
 %doc doc/build/html/*
 %endif
 
 %changelog
+* Wed Apr 20 2022 Jerry James <loganjerry@gmail.com> - 2.8-1
+- Version 2.8
+- Bring back the doc subpackage
+
 * Tue Mar 29 2022 Jerry James <loganjerry@gmail.com> - 2.7.1-1
 - Version 2.7.1
 - Do not build documentation by default
diff --git a/sources b/sources
index 9a5119a..633a50c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (networkx-2.7.1.tar.gz) = 71b233c74aea61aa07a0898e72aaedbb3bedb5f25c9e9ee3a62ff639ccf932e238a6650bf0d88f7b6d28d9952df02b522fc8db9fe855c58c39fce6e709040966
+SHA512 (networkx-2.8.tar.gz) = b3ab5c1cfa98f16c7a8a9bbff14100ce3270220be7cb869adc7bde4776924be14a7b5fd193754b4fa1e7f0944e404a38edbea18e7f10d0f10bbd803879f5816e