diff --git a/python-argparse-manpage.changes b/python-argparse-manpage.changes
index 5d5f6e8..a76d4f0 100644
--- a/python-argparse-manpage.changes
+++ b/python-argparse-manpage.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jan  8 03:47:56 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Drop patch skip-pip-install.patch:
+  * Create a pip links directory with a wheel of setuptools, since that
+    is the only requirement for pip install with the current version of
+    setuptools.
+- Remove unneeded Requires, limit them appropiately.
+- Switch to pyproject macros.
+
 -------------------------------------------------------------------
 Wed Jun 12 09:22:52 UTC 2024 - Dirk Müller <dmueller@suse.com>
 
diff --git a/python-argparse-manpage.spec b/python-argparse-manpage.spec
index bb86b26..dd34c7c 100644
--- a/python-argparse-manpage.spec
+++ b/python-argparse-manpage.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-argparse-manpage
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,17 +24,17 @@ Summary:        Tool for automatic manual page building from a Python ArgumentPa
 License:        Apache-2.0
 URL:            https://github.com/praiskup/argparse-manpage
 Source:         https://github.com/praiskup/argparse-manpage/archive/v%{version}.tar.gz
-# PATCH-FIX-OPENSUSE Skip pip install tests until pip can behave better
-Patch0:         skip-pip-install.patch
 BuildArch:      noarch
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module pytest}
+BuildRequires:  %{python_module setuptools-wheel}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  ca-certificates
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
-Requires:       python-setuptools
+%if 0%{python_version_nodots} < 311
 Requires:       python-tomli
+%endif
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
 %python_subpackages
@@ -52,15 +52,19 @@ support for (deprecated) optparse objects, too.
 %autosetup -p1 -n %{mod_name}-%{version}
 
 %build
-%python_build
+%pyproject_wheel
 
 %install
-%python_install
+%pyproject_install
 %python_clone -a %{buildroot}%{_bindir}/argparse-manpage
 %python_clone -a %{buildroot}%{_mandir}/man1/argparse-manpage.1
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 
 %check
+mkdir wheels
+cp $(ls -1 /usr/lib/python3.*/wheels/setuptools*whl | head -n 1) wheels
+export PIP_NO_INDEX=1
+export PIP_FIND_LINKS=$(pwd)/wheels
 %pytest
 
 %post
@@ -70,11 +74,11 @@ support for (deprecated) optparse objects, too.
 %python_uninstall_alternative argparse-manpage
 
 %files %{python_files}
-%doc README*
+%doc README.md
 %license LICENSE
 %{python_sitelib}/argparse_manpage
 %{python_sitelib}/build_manpages
-%{python_sitelib}/argparse_manpage-%{version}*info
+%{python_sitelib}/argparse_manpage-%{version}.dist-info
 %python_alternative %{_bindir}/argparse-manpage
 %python_alternative %{_mandir}/man1/argparse-manpage.1%{?ext_man}
 
diff --git a/skip-pip-install.patch b/skip-pip-install.patch
deleted file mode 100644
index 9f58a76..0000000
--- a/skip-pip-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: argparse-manpage-4.3/tests/test_examples.py
-===================================================================
---- argparse-manpage-4.3.orig/tests/test_examples.py
-+++ argparse-manpage-4.3/tests/test_examples.py
-@@ -38,6 +38,8 @@ def _rmtree(directory):
-             raise
- 
- def run_pip(args):
-+    # Until we can figure out how to make pip behave
-+    raise unittest.SkipTest()
-     environ = os.environ.copy()
-     environ['PYTHONPATH'] = ':'.join(sys.path)
-     from pip import __version__