diff --git a/.gitignore b/.gitignore
index 649fa14..8156cf0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /service_identity-16.0.0.tar.gz
 /service-identity-16.0.0.tar.gz
 /service-identity-18.1.0.tar.gz
+/service-identity-21.1.0.tar.gz
diff --git a/0001-Revert-theme-change.patch b/0001-Revert-theme-change.patch
new file mode 100644
index 0000000..8940390
--- /dev/null
+++ b/0001-Revert-theme-change.patch
@@ -0,0 +1,56 @@
+From 18b24292779f8548198d3e4ada2e52d7669607e8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
+Date: Mon, 24 May 2021 13:58:40 +0200
+Subject: [PATCH] Revert theme change"
+
+---
+ docs/conf.py                     | 11 +++++++++--
+ setup.py                         |  2 +--
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index 1517620..e9745c6 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -117,7 +117,7 @@ exclude_patterns = ["_build"]
+ # show_authors = False
+ 
+ # The name of the Pygments (syntax highlighting) style to use.
+-# pygments_style = "sphinx"
++pygments_style = "sphinx"
+ 
+ # A list of ignored prefixes for module index sorting.
+ # modindex_common_prefix = []
+@@ -131,7 +131,14 @@ exclude_patterns = ["_build"]
+ # The theme to use for HTML and HTML Help pages.  See the documentation for
+ # a list of builtin themes.
+ 
+-html_theme = "furo"
++html_theme = "alabaster"
++html_theme_options = {
++    "font_family": '"Avenir Next", Calibri, "PT Sans", sans-serif',
++    "head_font_family": '"Avenir Next", Calibri, "PT Sans", sans-serif',
++    "font_size": "18px",
++    "page_width": "980px",
++    "show_relbars": True,
++}
+ 
+ # Theme options are theme-specific and customize the look and feel of a theme
+ # further.  For a list of options available for each theme, see the
+diff --git a/setup.py b/setup.py
+index 921725a..29012ef 100644
+--- a/setup.py
++++ b/setup.py
+@@ -47,7 +46,7 @@ INSTALL_REQUIRES = [
+ EXTRAS_REQUIRE = {
+     "idna": ["idna"],
+     "tests": ["coverage[toml]>=5.0.2", "pytest"],
+-    "docs": ["sphinx", "furo"],
++    "docs": ["sphinx"],
+ }
+ EXTRAS_REQUIRE["dev"] = (
+     EXTRAS_REQUIRE["tests"] + EXTRAS_REQUIRE["docs"] + ["idna", "pyOpenSSL"]
+
+-- 
+2.31.1
+
diff --git a/python-service-identity.spec b/python-service-identity.spec
index eaa09a1..1144e59 100644
--- a/python-service-identity.spec
+++ b/python-service-identity.spec
@@ -4,13 +4,15 @@
 %global srcname service_identity
 
 Name:           python-%{modname}
-Version:        18.1.0
-Release:        9%{?dist}
+Version:        21.1.0
+Release:        1%{?dist}
 Summary:        Service identity verification for pyOpenSSL
 
 License:        MIT
 URL:            https://github.com/pyca/service_identity
 Source0:        %{url}/archive/%{version}/%{modname}-%{version}.tar.gz
+# Revert theme change as "furo" theme is not packaged
+Patch0:         0001-Revert-theme-change.patch
 
 BuildArch:      noarch
 
@@ -35,7 +37,7 @@ BuildRequires:  python3-devel
 BuildRequires:  python3dist(setuptools)
 BuildRequires:  python3dist(sphinx)
 %if %{with check}
-BuildRequires:  python3dist(attrs)
+BuildRequires:  python3dist(attrs) >= 19.1.0
 BuildRequires:  python3dist(idna) >= 0.6
 BuildRequires:  python3dist(pyasn1)
 BuildRequires:  python3dist(pyasn1-modules)
@@ -59,7 +61,7 @@ Summary:        Service-identity documentation
 Documentation for service-identity.
 
 %prep
-%autosetup -n %{srcname}-%{version}
+%autosetup -p1 -n %{modname}-%{version}
 
 %build
 %py3_build
@@ -88,6 +90,10 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} py.test-%{python3_version} -v
 %license LICENSE docs/license.rst
 
 %changelog
+* Mon May 24 13:50:05 CEST 2021 Robert-André Mauchin <zebob.m@gmail.com> - 21.1.0-1
+- Update to 21.1.0
+- Close: rhbz#1958639
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 18.1.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index ca9e413..ef875b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (service-identity-18.1.0.tar.gz) = 0d1abf6ba1e725e923171fd3b809b2cf7ba757ca47f773e8c99a2e2265425b253549609c76955c4d67fcd2fd305d479a1d7541cb26811e94db26ab853d3d3441
+SHA512 (service-identity-21.1.0.tar.gz) = 6375bc5e8329118b2beb163ffffecc1479839e4e98173576e4737deebcc4c057ac357315976d3f53a280defd4e2c1f6b74e9604ec1aa94144240c2fb4bf07461