diff --git a/debian/changelog b/debian/changelog
index d30ccd02..3ef35927 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,13 +8,17 @@ llvm-toolchain-snapshot (1:18~++20230921012857+4cf8da94198d-1~exp1) UNRELEASED;
   * Rename lldb-vscode => lldb-dap
   * Ship tblgen-to-irdl as part of mlir-tools
 
-llvm-toolchain-17 (1:17.0.3-1~exp2) UNRELEASED; urgency=medium
+llvm-toolchain-17 (1:17.0.4-1) unstable; urgency=medium
 
   [ Matthias Klose ]
   * Limit the number of parallel processes based on the available memory
     and the packages to be built (flang has some memory hogs).
 
- -- Matthias Klose <doko@debian.org>  Wed, 18 Oct 2023 15:00:25 +0200
+  [ Sylvestre Ledru ]
+  * New supstream release
+  * Upload to unstable
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 31 Oct 2023 11:39:22 +0100
 
 llvm-toolchain-17 (1:17.0.3-1~exp1) experimental; urgency=medium
 
@@ -215,6 +219,8 @@ llvm-toolchain-snapshot (1:17~++20230128060150+75153adeda1a-1~exp1) experimental
 llvm-toolchain-16 (1:16.0.6-18) UNRELEASED; urgency=medium
 
   * Upload to sid
+  [ Steve Langasek ]
+  * Add noble as supported Ubuntu release
 
  -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 25 Oct 2023 08:10:35 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index a58f5b2a..0b23267d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -145,3 +145,4 @@ unwind-force-pthread-dl.diff
 force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
+ubuntu-releases.patch
diff --git a/debian/patches/ubuntu-releases.patch b/debian/patches/ubuntu-releases.patch
new file mode 100644
index 00000000..a2d7fbe2
--- /dev/null
+++ b/debian/patches/ubuntu-releases.patch
@@ -0,0 +1,38 @@
+Description: Update the list of Ubuntu release names
+Forwarded: no
+Author: Graham Inggs <ginggs@debian.org>
+Last-Update: 2023-04-29
+
+Index: llvm-toolchain-17-17.0.3/clang/include/clang/Driver/Distro.h
+===================================================================
+--- llvm-toolchain-17-17.0.3.orig/clang/include/clang/Driver/Distro.h
++++ llvm-toolchain-17-17.0.3/clang/include/clang/Driver/Distro.h
+@@ -78,6 +78,7 @@
+     UbuntuKinetic,
+     UbuntuLunar,
+     UbuntuMantic,
++    UbuntuNoble,
+     UnknownDistro
+   };
+ 
+@@ -129,7 +130,7 @@
+   }
+ 
+   bool IsUbuntu() const {
+-    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuMantic;
++    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuNoble;
+   }
+ 
+   bool IsAlpineLinux() const { return DistroVal == AlpineLinux; }
+Index: llvm-toolchain-17-17.0.3/clang/lib/Driver/Distro.cpp
+===================================================================
+--- llvm-toolchain-17-17.0.3.orig/clang/lib/Driver/Distro.cpp
++++ llvm-toolchain-17-17.0.3/clang/lib/Driver/Distro.cpp
+@@ -94,6 +94,7 @@
+                     .Case("kinetic", Distro::UbuntuKinetic)
+                     .Case("lunar", Distro::UbuntuLunar)
+                     .Case("mantic", Distro::UbuntuMantic)
++                    .Case("noble", Distro::UbuntuNoble)
+                     .Default(Distro::UnknownDistro);
+   return Version;
+ }