diff --git a/362-skip-failing-tests.patch b/362-skip-failing-tests.patch
deleted file mode 100644
index 9e146d6..0000000
--- a/362-skip-failing-tests.patch
+++ /dev/null
@@ -1,38 +0,0 @@
----
- test/test_torinfo.py |    4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/test/test_torinfo.py
-+++ b/test/test_torinfo.py
-@@ -2,6 +2,7 @@ from zope.interface import implementer
- from twisted.trial import unittest
- from twisted.test import proto_helpers
- from twisted.internet import defer
-+from unittest import skip
- 
- from txtorcon import ITorControlProtocol, TorInfo, TorControlProtocol
- 
-@@ -60,6 +61,7 @@ class ProtocolIntegrationTests(unittest.
-     def send(self, line):
-         self.protocol.dataReceived(line.strip() + b"\r\n")
- 
-+    @skip('Skip failing test')
-     @defer.inlineCallbacks
-     def test_with_arg(self):
-         info = TorInfo(self.protocol)
-@@ -154,6 +156,7 @@ something/two a second documentation str
-         d.addCallback(CheckAnswer(self, 'bar'))
-         return d
- 
-+    @skip('Skip failing test')
-     @defer.inlineCallbacks
-     def test_attribute_access(self):
-         '''
-@@ -295,6 +298,7 @@ config/* a documentation string
-         info = TorInfo(self.protocol)
-         self.assertEqual(dir(info), [])
- 
-+    @skip('Skip failing test')
-     def test_other_bootstrap(self):
-         self.protocol.answers.append('''info/names=
- multi/path/arg/* a documentation string
diff --git a/python-txtorcon.changes b/python-txtorcon.changes
index 8c003d1..f748a2e 100644
--- a/python-txtorcon.changes
+++ b/python-txtorcon.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Tue Aug 31 20:06:50 UTC 2021 - Matej Cepl <mcepl@suse.com>
+
+- Update to 21.1.0:
+  - This fixes some incorrectly-skipped tests in 21.0.0
+    * Fix some incorrect unit-test skipping logic gh#meejah/txtorcon#354
+      and gh#meejah/txtorcon#352
+    * Fix broken tests revealed by previous fixes gh#meejah/txtorcon#356
+    * fix Python 3.x+ bug with TorInfo and .__class__ access
+      (gh#meejah/txtorcon#350)
+- Patch 362-skip-failing-tests.patch can be removed again.
+
 -------------------------------------------------------------------
 Tue Aug 31 16:08:32 UTC 2021 - Matej Cepl <mcepl@suse.com>
 
diff --git a/python-txtorcon.spec b/python-txtorcon.spec
index bda4da3..7f4f2ae 100644
--- a/python-txtorcon.spec
+++ b/python-txtorcon.spec
@@ -19,15 +19,12 @@
 %{?!python_module:%define python_module() python-%{**} %{!?skip_python3:python3-%{**}}}
 %bcond_without python2
 Name:           python-txtorcon
-Version:        20.0.0
+Version:        21.1.0
 Release:        0
 Summary:        Twisted-based asynchronous Tor control protocol implementation
 License:        MIT
 URL:            https://txtorcon.readthedocs.org
 Source:         https://files.pythonhosted.org/packages/source/t/txtorcon/txtorcon-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM 362-skip-failing-tests.patch gh#meejah/txtorcon#362 mcepl@suse.com
-# Skip failing tests
-Patch0:         362-skip-failing-tests.patch
 BuildRequires:  %{python_module setuptools >= 36.2}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
diff --git a/txtorcon-20.0.0.tar.gz b/txtorcon-20.0.0.tar.gz
deleted file mode 100644
index 0a50222..0000000
--- a/txtorcon-20.0.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:122cd081786396f57718adda1c1a5eb01b8e9a4832fcd140918b45c10359377a
-size 306139
diff --git a/txtorcon-21.1.0.tar.gz b/txtorcon-21.1.0.tar.gz
new file mode 100644
index 0000000..0538300
--- /dev/null
+++ b/txtorcon-21.1.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aebf0b9ec6c69a029f6b61fd534e785692e28fdcd2fd003ce3cc132b9393b7d6
+size 310839