diff --git a/python-bpython.changes b/python-bpython.changes
index 638ae1f..670cd74 100644
--- a/python-bpython.changes
+++ b/python-bpython.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 23 08:55:21 UTC 2023 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Stop calling setup.py build_sphinx, switch to sphinx-build, and also
+  build manual pages. 
+
 -------------------------------------------------------------------
 Mon Jan 23 14:39:42 UTC 2023 - Markéta Machová <mmachova@suse.com>
 
diff --git a/python-bpython.spec b/python-bpython.spec
index e7039ba..acdf133 100644
--- a/python-bpython.spec
+++ b/python-bpython.spec
@@ -16,8 +16,6 @@
 #
 
 
-%define         skip_python2 1
-%define         skip_python36 1
 %bcond_without     test
 Name:           python-bpython
 Version:        0.24
@@ -94,10 +92,18 @@ Documentation and help files for %{name}.
 
 %build
 %pyproject_wheel
-%python_exec setup.py build_sphinx && rm build/sphinx/html/.buildinfo # HTML documentation
+# Build HTML documentation
+sphinx-build doc/sphinx/source build/sphinx/html && rm build/sphinx/html/.buildinfo
+# .. and the manual pages
+sphinx-build -b man doc/sphinx/source build/sphinx/man
 
 %install
 %pyproject_install
+# install manual pages by hand, for now: gh#bpython/bpython/issues/987
+mkdir -p %{buildroot}%{_mandir}/man1
+mkdir %{buildroot}%{_mandir}/man5
+mv build/sphinx/man/bpython.1 %{buildroot}/%{_mandir}/man1
+mv build/sphinx/man/bpython-config.5 %{buildroot}/%{_mandir}/man5
 
 %python_clone -a %{buildroot}%{_bindir}/bpython
 %python_clone -a %{buildroot}%{_bindir}/bpython-curses