diff -pruN 3.13.3-3/debian/changelog 3.13.3-3ubuntu1/debian/changelog
--- 3.13.3-3/debian/changelog	2026-01-08 12:28:49.000000000 +0000
+++ 3.13.3-3ubuntu1/debian/changelog	2026-04-06 15:01:20.000000000 +0000
@@ -1,3 +1,17 @@
+python-aiohttp (3.13.3-3ubuntu1) resolute; urgency=medium
+
+  * Cherry-pick upstream commit for compatibility with idna 3.11
+  * Skip test_parse_set_cookie_headers_uses_unquote_with_octal,
+    control characters are now rejected by Python, see gh-145599
+
+ -- Graham Inggs <ginggs@ubuntu.com>  Mon, 06 Apr 2026 15:01:20 +0000
+
+python-aiohttp (3.13.3-3build1) resolute; urgency=medium
+
+  * No-change rebuild to drop Python 3.13 bits.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 20 Mar 2026 11:18:37 +0100
+
 python-aiohttp (3.13.3-3) unstable; urgency=medium
 
   * Skip two performance tests that are failing on riscv64.
diff -pruN 3.13.3-3/debian/control 3.13.3-3ubuntu1/debian/control
--- 3.13.3-3/debian/control	2026-01-05 22:25:12.000000000 +0000
+++ 3.13.3-3ubuntu1/debian/control	2026-04-06 13:29:08.000000000 +0000
@@ -1,6 +1,7 @@
 Source: python-aiohttp
 Section: python
-Maintainer: Debian Python Team <team+python@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Python Team <team+python@tracker.debian.org>
 Uploaders: Tianon Gravi <admwiggin@gmail.com>,
            Paul Tagliamonte <paultag@debian.org>,
            Piotr Ożarowski <piotr@debian.org>,
diff -pruN 3.13.3-3/debian/patches/idna3.11.patch 3.13.3-3ubuntu1/debian/patches/idna3.11.patch
--- 3.13.3-3/debian/patches/idna3.11.patch	1970-01-01 00:00:00.000000000 +0000
+++ 3.13.3-3ubuntu1/debian/patches/idna3.11.patch	2026-04-06 13:45:02.000000000 +0000
@@ -0,0 +1,16 @@
+Description: Fix test_invalid_idna for idna 3.11 compatibility
+Origin: upstream, https://github.com/aio-libs/aiohttp/commit/9053e8ce4a72cfc38eba9f224d4d432371c0c25b
+Author: Rodrigo Nogueira <rodrigo.b.nogueira@gmail.com>
+Last-Update: 2026-02-15
+
+--- a/tests/test_client_functional.py
++++ b/tests/test_client_functional.py
+@@ -3319,7 +3319,7 @@
+     session = aiohttp.ClientSession()
+     try:
+         with pytest.raises(aiohttp.InvalidURL):
+-            await session.get("http://\u2061owhefopw.com")
++            await session.get("http://\u0080owhefopw.com")
+     finally:
+         await session.close()
+ 
diff -pruN 3.13.3-3/debian/patches/series 3.13.3-3ubuntu1/debian/patches/series
--- 3.13.3-3/debian/patches/series	2026-01-05 22:20:36.000000000 +0000
+++ 3.13.3-3ubuntu1/debian/patches/series	2026-04-06 14:22:04.000000000 +0000
@@ -3,3 +3,4 @@
 0004-remove-sphinxcontrib.towncrier-for-now.patch
 0005-avoid-aiohttp-theme.patch
 0006-Use-local-Sphinx-inventories-where-available.patch
+idna3.11.patch
diff -pruN 3.13.3-3/debian/rules 3.13.3-3ubuntu1/debian/rules
--- 3.13.3-3/debian/rules	2026-01-08 12:27:28.000000000 +0000
+++ 3.13.3-3ubuntu1/debian/rules	2026-04-06 14:43:31.000000000 +0000
@@ -22,6 +22,7 @@ export PYBUILD_TEST_ARGS=--no-cov \
         not test_ctor and \
         not test_base_ctor and \
         not test_cookie_pattern_performance and \
+        not test_parse_set_cookie_headers_uses_unquote_with_octal and \
         not test_regex_performance and \
         not test_feed_eof_no_err_brotli and \
         not test_http_response_parser_strict_obs_line_folding and \