diff --git a/changelog.d/20039.misc b/changelog.d/20039.misc
new file mode 100644
index 0000000000..d8900d1223
--- /dev/null
+++ b/changelog.d/20039.misc
@@ -0,0 +1 @@
+Add package build targets for Ubuntu 26.04 'Resolute Raccoon'.
diff --git a/changelog.d/20039.removal b/changelog.d/20039.removal
new file mode 100644
index 0000000000..3a83c77275
--- /dev/null
+++ b/changelog.d/20039.removal
@@ -0,0 +1 @@
+Remove package build targets for Ubuntu 25.10 'Questing Quokka' (end-of-life 2026-07-01).
diff --git a/docs/upgrade.md b/docs/upgrade.md
index 372e9d147b..2f65d86cbe 100644
--- a/docs/upgrade.md
+++ b/docs/upgrade.md
@@ -117,6 +117,14 @@ each upgrade are complete before moving on to the next upgrade, to avoid
 stacking them up. You can monitor the currently running background updates with
 [the Admin API](usage/administration/admin_api/background_updates.html#status).
 
+# Upgrading to v1.158.0
+
+## Drop support for Ubuntu 25.10 'Questing Quokka', add support for Ubuntu 26.04 'Resolute Raccoon'
+
+Ubuntu 25.10 'Questing Quokka' [is end-of-life as of
+2026-07-01](https://endoflife.date/ubuntu). This release drops support for Ubuntu 25.10,
+and in its place adds support for Ubuntu 26.04 'Resolute Raccoon'.
+
 # Upgrading to v1.157.0
 
 ## MSC3861 Auth Delegation must be migrated to stable Matrix Authentication Service integration
diff --git a/scripts-dev/build_debian_packages.py b/scripts-dev/build_debian_packages.py
index cdde81ee2c..bd5c890711 100755
--- a/scripts-dev/build_debian_packages.py
+++ b/scripts-dev/build_debian_packages.py
@@ -27,12 +27,12 @@ from typing import Collection, Sequence
 # to remove references to the distibution across Synapse (search for "bookworm" for
 # example)
 DISTS = (
-    "debian:bookworm",  # (EOL 2026-06) (our EOL forced by Python 3.11 is 2027-10-24)
+    "debian:bookworm",  # (EOL 2028-06-30) (our EOL forced by Python 3.11 is 2027-10-31)
     "debian:sid",  # (rolling distro, no EOL)
-    "ubuntu:jammy",  # 22.04 LTS (EOL 2027-04) (our EOL forced by Python 3.10 is 2026-10-04)
-    "ubuntu:noble",  # 24.04 LTS (EOL 2029-06)
-    "ubuntu:questing",  # 25.10 (EOL 2026-07)
-    "debian:trixie",  # (EOL not specified yet)
+    "ubuntu:jammy",  # 22.04 LTS (EOL 2027-04-01) (our EOL forced by Python 3.10 is 2026-10-31)
+    "ubuntu:noble",  # 24.04 LTS (EOL 2029-05-31) (our EOL forced by Python 3.12 is 2028-10-31)
+    "debian:trixie",  # (EOL 2030-06-30) (our EOL forced by Python 3.13 is 2029-10-31)
+    "ubuntu:resolute",  # 26.04 (EOL 2031-04-30) (our EOL forced by Python 3.14 is 2030-10-31)
 )
 
 DESC = """\