diff --git a/.gitignore b/.gitignore
index 0a2d3a4..d8ccc86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@
 /attrs-20.1.0.tar.gz
 /attrs-20.2.0.tar.gz
 /attrs-20.3.0.tar.gz
+/attrs-21.1.0.tar.gz
+/attrs-21.2.0.tar.gz
diff --git a/fix-tests-with-Python-3.10.patch b/fix-tests-with-Python-3.10.patch
deleted file mode 100644
index 5ff0e87..0000000
--- a/fix-tests-with-Python-3.10.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2d150df7974a4a97ba3cbaec5a838f019882b527 Mon Sep 17 00:00:00 2001
-From: Lumir Balhar <lbalhar@redhat.com>
-Date: Wed, 5 May 2021 10:36:09 +0200
-Subject: [PATCH] Fix tests with Python 3.10
-
----
- tests/test_dunders.py | 3 +--
- tests/test_funcs.py   | 2 +-
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/tests/test_dunders.py b/tests/test_dunders.py
-index 2f1ebab..6afe860 100644
---- a/tests/test_dunders.py
-+++ b/tests/test_dunders.py
-@@ -622,9 +622,8 @@ class TestAddInit(object):
-         with pytest.raises(TypeError) as e:
-             C(a=1, b=2)
- 
--        assert (
-+        assert e.value.args[0].endswith(
-             "__init__() got an unexpected keyword argument 'a'"
--            == e.value.args[0]
-         )
- 
-     @given(booleans(), booleans())
-diff --git a/tests/test_funcs.py b/tests/test_funcs.py
-index 20e2747..64e3eb7 100644
---- a/tests/test_funcs.py
-+++ b/tests/test_funcs.py
-@@ -545,7 +545,7 @@ class TestEvolve(object):
-         with pytest.raises(TypeError) as e:
-             evolve(C(), aaaa=2)
-         expected = "__init__() got an unexpected keyword argument 'aaaa'"
--        assert (expected,) == e.value.args
-+        assert e.value.args[0].endswith(expected)
- 
-     def test_validator_failure(self):
-         """
--- 
-2.31.1
-
diff --git a/python-attrs.spec b/python-attrs.spec
index fb0602b..a862fa1 100644
--- a/python-attrs.spec
+++ b/python-attrs.spec
@@ -9,8 +9,8 @@
 %endif
 
 Name:           python-attrs
-Version:        20.3.0
-Release:        3%{?dist}
+Version:        21.2.0
+Release:        1%{?dist}
 Summary:        Python attributes without boilerplate
 
 License:        MIT
@@ -18,12 +18,6 @@ URL:            http://www.attrs.org/
 BuildArch:      noarch
 Source0:        https://github.com/hynek/%{modname}/archive/%{version}/%{modname}-%{version}.tar.gz
 
-# Partial backport of
-# https://github.com/python-attrs/attrs/commit/03d3fc7a71fe770e1f86b9c3ad8588586e5ea63b
-# to make tests pass. What happens next should be in
-# https://github.com/python-attrs/attrs/issues/803
-Patch0:         fix-tests-with-Python-3.10.patch
-
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-setuptools
 %if %{with tests}
@@ -49,7 +43,6 @@ object protocols.
 
 %prep
 %setup -q -n %{modname}-%{version}
-%patch0 -p1
 
 %build
 %py3_build
@@ -68,6 +61,10 @@ PYTHONPATH=%{buildroot}/%{python3_sitelib} py.test-3 -v
 %{python3_sitelib}/*
 
 %changelog
+* Fri May 07 2021 Lumír Balhar <lbalhar@redhat.com> - 21.2.0-1
+- Update to 21.2.0
+  Resolves: rhbz#1957660
+
 * Wed May 05 2021 Lumír Balhar <lbalhar@redhat.com> - 20.3.0-3
 - Fix tests with Python 3.10
 
diff --git a/sources b/sources
index d1f309d..b54efba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (attrs-20.3.0.tar.gz) = bb6cb43b8e7ba32caa18378d6bb20121be930d3397cc0793fe44c2c4c00beec81055b8fde32ea52e51cf7a3029c049f650c4df4ec73a4a104f75a9a399bf5194
+SHA512 (attrs-21.2.0.tar.gz) = fa6569f3bdcc74a735b31dc67ce5ca3535eab8a5eb30f6b91ebf1149609294c0ef0d0910b8e41205d31c4745354c2262c18db901bae0af82c8b8cefc46f8a0a9