diff --git a/Cargo.toml b/Cargo.toml
index 70649146..68f5f5b3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -253,6 +253,9 @@ depends = "$auto, passwd, libssl3, adduser"
 [package.metadata.deb.variants.ubuntu-noble]
 depends = "$auto, passwd, libssl3"
 
+[package.metadata.deb.variants.ubuntu-resolute]
+depends = "$auto, passwd, libssl3"
+
 # Cross compilation variants:
 # Note: we have to specifiy dependencies manually because we don't run cargo-deb
 # on the target platform and so it cannot determine the dependencies correctly
diff --git a/Changelog.md b/Changelog.md
index 9406e5d4..44facd88 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,12 +6,16 @@ Breaking changes
 
 New
 
+* Support for Ubuntu Resolute Raccoon (26.04). ([#1378])
+
 Improvements
 
 Bug fixes
 
 Other changes
 
+[#1378]: https://github.com/NLnetLabs/krill/pull/1378
+
 
 ## 0.16.0 ‘Früher war mehr Lametta’
 
diff --git a/doc/manual/source/install-and-run.rst b/doc/manual/source/install-and-run.rst
index 9b02f770..10949247 100644
--- a/doc/manual/source/install-and-run.rst
+++ b/doc/manual/source/install-and-run.rst
@@ -111,9 +111,10 @@ public rsyncd and HTTPS web server available.
 
    .. group-tab:: Ubuntu
 
-       To install a Routinator package, you need the 64-bit version of one of
+       To install a Krill package, you need the 64-bit version of one of
        these Ubuntu versions:
 
+         - Ubuntu Noble 26.04 (LTS)
          - Ubuntu Noble 24.04 (LTS)
          - Ubuntu Jammy 22.04 (LTS)
          - Ubuntu Focal 20.04 (LTS)
diff --git a/pkg/rules/packages-to-build.yml b/pkg/rules/packages-to-build.yml
index 411bc702..823ffd4f 100644
--- a/pkg/rules/packages-to-build.yml
+++ b/pkg/rules/packages-to-build.yml
@@ -7,6 +7,7 @@ pkg:
 image:
   - "ubuntu:jammy" # ubuntu/22.04
   - "ubuntu:noble" # ubuntu/24.04
+  - "ubuntu:resolute" # ubuntu/26.04
   - "debian:bullseye" # debian/11
   - "debian:bookworm" # debian/12
   - "debian:trixie" # debian/13
diff --git a/pkg/rules/packages-to-test.yml b/pkg/rules/packages-to-test.yml
index 228cb09e..e5383673 100644
--- a/pkg/rules/packages-to-test.yml
+++ b/pkg/rules/packages-to-test.yml
@@ -5,9 +5,9 @@ pkg:
   - "krillup"
   - "krillta"
 image:
-  - "ubuntu:focal" # ubuntu/20.04
   - "ubuntu:jammy" # ubuntu/22.04
   - "ubuntu:noble" # ubuntu/24.04
+  - "ubuntu:resolute" # ubuntu/26.04
   - "debian:bullseye" # debian/11
   - "debian:bookworm" # debian/12
   - "debian:trixie" # debian/13
@@ -48,11 +48,7 @@ include:
     image: "debian:bullseye"
     target: "armv7-unknown-linux-gnueabihf"
 
-# Exclude upgrade testing on Ubuntu Noble as no prior released versions exist to upgrade from.
+# Exclude upgrade testing on Ubuntu Resolute as no prior released versions exist to upgrade from.
 exclude:
-  - image: "almalinux:9"
-    mode: "upgrade-from-published"
-  - image: "ubuntu:noble"
-    mode: "upgrade-from-published"
-  - image: "debian:trixie"
+  - image: "ubuntu:resolute"
     mode: "upgrade-from-published"