diff --git a/.gitignore b/.gitignore
index 7d53bcb..0c29af9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@
 /cliff-3.6.0.tar.gz
 /cliff-3.7.0.tar.gz
 /cliff-3.8.0.tar.gz
+/cliff-3.9.0.tar.gz
diff --git a/0001-Update-unit-test-to-satisfy-python3.10.patch b/0001-Update-unit-test-to-satisfy-python3.10.patch
deleted file mode 100644
index 4f0b239..0000000
--- a/0001-Update-unit-test-to-satisfy-python3.10.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From f85bf8d60d569c6bb95340ca608954a81a3e7088 Mon Sep 17 00:00:00 2001
-From: Joel Capitao <jcapitao@redhat.com>
-Date: Thu, 11 Feb 2021 09:46:37 +0100
-Subject: [PATCH] Update unit test to satisfy python3.10+
-
-Fedora is already testing Python 3.10 [1] and an issue
-has been raised [2].
-All the details are in the BZ ticket but TLDR is that
-"optional arguments" was replaced with "options [3].
-So, I used assertRegexp to accept both of them (i.e
-"optional arguments" and "options").
-
-[1] https://fedoraproject.org/wiki/Changes/Python3.10
-[2] https://bugzilla.redhat.com/show_bug.cgi?id=1914138
-[3] https://github.com/python/cpython/commit/fb35fa49d192368e94ffec09c092260ed0fea2e1
-
-Change-Id: I18d9f1bea7bb5a7afb273550314c36da7b466a69
----
- cliff/tests/test_help.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cliff/tests/test_help.py b/cliff/tests/test_help.py
-index 9034779..fb5fc66 100644
---- a/cliff/tests/test_help.py
-+++ b/cliff/tests/test_help.py
-@@ -101,7 +101,7 @@ class TestHelp(base.TestBase):
-         help_text = stdout.getvalue()
-         basecommand = os.path.split(sys.argv[0])[1]
-         self.assertIn('usage: %s [--version]' % basecommand, help_text)
--        self.assertIn('optional arguments:\n  --version', help_text)
-+        self.assertRegex(help_text, 'option.*:\n  --version')
-         expected = (
-             '  one            Test command.\n'
-             '  three word command  Test command.\n'
--- 
-2.31.1
-
diff --git a/python-cliff.spec b/python-cliff.spec
index 2315fc1..c63bd86 100644
--- a/python-cliff.spec
+++ b/python-cliff.spec
@@ -14,8 +14,8 @@ http://readthedocs.org/docs/cliff/en/latest/
 %global common_desc_tests This package contains tests for the python cliff library.
 
 Name:             python-%{modname}
-Version:          3.8.0
-Release:          2%{?dist}
+Version:          3.9.0
+Release:          1%{?dist}
 Summary:          Command Line Interface Formulation Framework
 
 Group:            Development/Libraries
@@ -23,10 +23,6 @@ License:          ASL 2.0
 URL:              https://pypi.io/pypi/cliff
 Source0:          https://pypi.io/packages/source/c/cliff/cliff-%{version}.tar.gz
 
-# Add compatibility with Python 3.10
-# https://review.opendev.org/c/openstack/cliff/+/775091
-Patch1:           0001-Update-unit-test-to-satisfy-python3.10.patch
-
 BuildArch:        noarch
 
 %package -n python3-%{modname}
@@ -67,6 +63,7 @@ BuildRequires:    python3-testrepository
 BuildRequires:    python3-docutils
 BuildRequires:    python3-PyYAML
 BuildRequires:    python3-pytest
+BuildRequires:    python3-autopage
 
 Requires:         python3-%{modname} = %{version}-%{release}
 Requires:         python3-mock
@@ -86,7 +83,6 @@ Requires:         python3-PyYAML
 
 %prep
 %setup -q -n %{modname}-%{upstream_version}
-%patch1 -p1
 rm -rf {test-,}requirements.txt
 
 # Remove bundled egg info
@@ -112,6 +108,9 @@ PYTHON=python3 python3 setup.py test
 %{python3_sitelib}/%{modname}/tests
 
 %changelog
+* Sat Nov 06 2021 Kevin Fenzi <kevin@scrye.com> - 3.9.0-1
+- Update to 3.9.1. Fixes rhbz#1997441
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index 73764e2..3b3fa5c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cliff-3.8.0.tar.gz) = 002e3ddfb254c5369582cc28572856a8b4ad05d598a7f8aa690add69f49cabb12ef2ef17b6c1553792aaee785b7c1703b05dd9d4889271cd5eba5629fad3d09b
+SHA512 (cliff-3.9.0.tar.gz) = 04b33e14c3b29a02dc04855044184f934919ff92dbc09003f620083e5815597f8dee7201fa33019dd58a3e701d4c3f9966be1f4d23e019a881fee9a9bc1f0dbd