diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index e089121..fd7eca9 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=python-twisted
-pkgver=21.7.0
-pkgrel=4
+pkgver=22.4.0rc1
+pkgrel=1
 pkgdesc="Asynchronous networking framework written in Python"
 arch=('any')
 url="https://twistedmatrix.com/"
@@ -27,21 +27,23 @@ optdepends=('python-pyopenssl: for TLS client hostname verification'
 checkdepends=('python-pyhamcrest' 'subversion' 'xorg-server-xvfb' 'tk' 'openssh' 'git' 'gtk3'
               'python-gobject' 'python-subunit' 'python-h2' 'python-priority' 'python-cryptography'
               'python-idna' 'python-pyasn1' 'python-pyserial' 'python-bcrypt'
-              'python-cython-test-exception-raiser' 'python-pyopenssl')
+              'python-cython-test-exception-raiser' 'python-pyopenssl' 'python-service-identity')
 # Conflicts with the command line tools used to be provided by the python2 package.
 conflicts=("python2-twisted<=20.3.0-3")
 source=("https://github.com/twisted/twisted/archive/twisted-$pkgver.tar.gz"
-        python310.patch)
-sha512sums=('a946769a6bc6c72af26e7763b9e0675788f134b4d005ea89d935da1b1d5f60d92c84fdb2615e442e7da2b98291ee8a63d5236ec7ba72ef04ad3f847b092feecb'
-            '5402256d06cbee74d575bdc57b8a3df2224aad531b083050c7a4e66e61b6ed2610e13de6a4346719318c076cabffce473e5dd0e14638cee6fd1cf930a50608c5')
+        skip-tests.diff
+        twisted-10318.patch::https://github.com/twisted/twisted/pull/1709.patch)
+sha512sums=('02420693546684e21bcae0ebbfce387737830e9170fa6413f5a4bfd9cca205265b0ce5ea2fa5176ab1901623b2fc4e19c47425fef47723dfba7dab0731ad55e0'
+            '746a13e232a12b93618740ad36f19fdd251fc3baa51c17f1dfd2969032b2755cc879361fc8995054fa8608895a9cf85c0c6e9dbfb646dd7749d7e120be941400'
+            'eeaf81c9599930f8645c8bf14baa25c6f66aaf3d396266124b825c8e672082ecab9d2cf5aa5d3be9c2a81d4c51afd7de1f68ee3699c773c406d7febea59230e1')
 
 prepare() {
   cd twisted-twisted-$pkgver
-  # Avoid currentThread() DeprecationWarning (breaks tests in other packages)
-  # Related upstream PR: https://github.com/twisted/twisted/pull/1671
-  patch -Np1 -i ../python310.patch
   # Remove upper bounds
   sed -i 's/, < 4.0//;s/, < 2.0//' setup.cfg
+  patch -Np1 -i ../twisted-10318.patch
+  # Skip broken tests
+  patch -Np1 -i ../skip-tests.diff
 }
 
 build() {
@@ -53,7 +55,7 @@ check() {
   export LC_CTYPE=en_US.UTF-8
 
   # tests use the underlying function from the 'python -m twisted.trial' module, to prevent loading system entry points
-  PYTHONPATH="$srcdir/twisted-twisted-$pkgver/build/lib" xvfb-run python -c 'from twisted.scripts.trial import run; run()' twisted || echo "Tests failed"
+  PYTHONPATH="$srcdir/twisted-twisted-$pkgver/build/lib" xvfb-run python -c 'from twisted.scripts.trial import run; run()' twisted
 }
 
 package() {
diff --git a/trunk/python310.patch b/trunk/python310.patch
deleted file mode 100644
index 5d77ea3..0000000
--- a/trunk/python310.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -upr twisted-twisted-21.7.0.orig/src/twisted/internet/test/test_threads.py twisted-twisted-21.7.0/src/twisted/internet/test/test_threads.py
---- twisted-twisted-21.7.0.orig/src/twisted/internet/test/test_threads.py	2021-07-26 18:03:56.000000000 +0300
-+++ twisted-twisted-21.7.0/src/twisted/internet/test/test_threads.py	2021-12-07 00:48:58.573886527 +0200
-@@ -108,13 +108,13 @@ class ThreadTestsBuilder(ReactorBuilder)
-         result = []
- 
-         def threadCall():
--            result.append(threading.currentThread())
-+            result.append(threading.current_thread())
-             reactor.stop()
- 
-         reactor.callLater(0, reactor.callInThread, reactor.callFromThread, threadCall)
-         self.runReactor(reactor, 5)
- 
--        self.assertEqual(result, [threading.currentThread()])
-+        self.assertEqual(result, [threading.current_thread()])
- 
-     def test_stopThreadPool(self):
-         """
-diff -upr twisted-twisted-21.7.0.orig/src/twisted/python/threadable.py twisted-twisted-21.7.0/src/twisted/python/threadable.py
---- twisted-twisted-21.7.0.orig/src/twisted/python/threadable.py	2021-07-26 18:03:56.000000000 +0300
-+++ twisted-twisted-21.7.0/src/twisted/python/threadable.py	2021-12-07 00:49:02.183979399 +0200
-@@ -104,7 +104,7 @@ _dummyID = object()
- def getThreadID():
-     if threadingmodule is None:
-         return _dummyID
--    return threadingmodule.currentThread().ident
-+    return threadingmodule.current_thread().ident
- 
- 
- def isInIOThread():
-diff -upr twisted-twisted-21.7.0.orig/src/twisted/python/threadpool.py twisted-twisted-21.7.0/src/twisted/python/threadpool.py
---- twisted-twisted-21.7.0.orig/src/twisted/python/threadpool.py	2021-07-26 18:03:56.000000000 +0300
-+++ twisted-twisted-21.7.0/src/twisted/python/threadpool.py	2021-12-07 00:49:27.894640858 +0200
-@@ -9,7 +9,7 @@ In most cases you can just use C{reactor
- instead of creating a thread pool directly.
- """
- 
--from threading import Thread, currentThread
-+from threading import Thread, current_thread
- from typing import List
- 
- from twisted._threads import pool as _pool
-@@ -44,7 +44,7 @@ class ThreadPool:
-     name = None
- 
-     threadFactory = Thread
--    currentThread = staticmethod(currentThread)
-+    currentThread = staticmethod(current_thread)
-     _pool = staticmethod(_pool)
- 
-     def __init__(self, minthreads=5, maxthreads=20, name=None):
-diff -upr twisted-twisted-21.7.0.orig/src/twisted/test/test_threadpool.py twisted-twisted-21.7.0/src/twisted/test/test_threadpool.py
---- twisted-twisted-21.7.0.orig/src/twisted/test/test_threadpool.py	2021-07-26 18:03:56.000000000 +0300
-+++ twisted-twisted-21.7.0/src/twisted/test/test_threadpool.py	2021-12-07 00:49:41.461656589 +0200
-@@ -404,11 +404,11 @@ class ThreadPoolTests(unittest.Synchrono
-         event = threading.Event()
- 
-         def onResult(success, result):
--            threadIds.append(threading.currentThread().ident)
-+            threadIds.append(threading.current_thread().ident)
-             event.set()
- 
-         def func():
--            threadIds.append(threading.currentThread().ident)
-+            threadIds.append(threading.current_thread().ident)
- 
-         tp = threadpool.ThreadPool(0, 1)
-         tp.callInThreadWithCallback(onResult, func)
diff --git a/trunk/skip-tests.diff b/trunk/skip-tests.diff
new file mode 100644
index 0000000..8fc2f64
--- /dev/null
+++ b/trunk/skip-tests.diff
@@ -0,0 +1,25 @@
+diff --git a/src/twisted/internet/test/test_tcp.py b/src/twisted/internet/test/test_tcp.py
+index 74dae6e5c..10c088d5a 100644
+--- a/src/twisted/internet/test/test_tcp.py
++++ b/src/twisted/internet/test/test_tcp.py
+@@ -1402,6 +1402,8 @@ class StreamTransportTestsMixin(LogObserverMixin):
+             connect=self.connectToListener,
+         )
+ 
++    test_closePeerOnEMFILE.skip = "https://twistedmatrix.com/trac/ticket/9495"
++
+ 
+ class ConnectToTCPListenerMixin:
+     """
+diff --git a/src/twisted/test/test_udp.py b/src/twisted/test/test_udp.py
+index f03f27afb..ad4e5cb1e 100644
+--- a/src/twisted/test/test_udp.py
++++ b/src/twisted/test/test_udp.py
+@@ -510,6 +510,7 @@ class ReactorShutdownInteractionTests(TestCase):
+     "This reactor does not support multicast",
+ )
+ class MulticastTests(TestCase):
++    skip = "https://twistedmatrix.com/trac/ticket/7494"
+ 
+     if (
+         os.environ.get("INFRASTRUCTURE") == "AZUREPIPELINES"