diff --git a/debian/changelog b/debian/changelog
index 8a5382de..26f668e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -183,6 +183,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 bbd25f55..1bb20ec6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,3 +148,4 @@ force-sse2-compiler-rt.diff
 bolt-disable-emit-relocs.patch
 link-grpc.diff
 D158066-simd-ppc64el.patch
+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;
+ }