diff --git a/debian/changelog b/debian/changelog
index 6daa3123..311834b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+llvm-toolchain-15 (1:15.0.7-5~exp3) UNRELEASED; urgency=medium
+
+  [ Graham Inggs ]
+  * debian/patches/ubuntu-releases.patch: Update the list of
+    Ubuntu release names
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Sun, 11 Jun 2023 09:26:23 +0200
+
 llvm-toolchain-15 (1:15.0.7-5~exp2) experimental; urgency=medium
 
   * Also apply the workround of issue #62621 for focal
diff --git a/debian/patches/series b/debian/patches/series
index af7b175a..fd726288 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -162,3 +162,4 @@ link-grpc.diff
 amdgpu/nonlinux.patch
 amdgpu/usr-search-paths.patch
 amdgpu/bitcode-multiarch.patch
+ubuntu-releases.patch
diff --git a/debian/patches/ubuntu-releases.patch b/debian/patches/ubuntu-releases.patch
new file mode 100644
index 00000000..cdb7c31f
--- /dev/null
+++ b/debian/patches/ubuntu-releases.patch
@@ -0,0 +1,36 @@
+Description: Update the list of Ubuntu release names
+Forwarded: no
+Author: Graham Inggs <ginggs@debian.org>
+Last-Update: 2023-04-29
+
+--- a/clang/include/clang/Driver/Distro.h
++++ b/clang/include/clang/Driver/Distro.h
+@@ -76,6 +76,8 @@
+     UbuntuImpish,
+     UbuntuJammy,
+     UbuntuKinetic,
++    UbuntuLunar,
++    UbuntuMantic,
+     UnknownDistro
+   };
+ 
+@@ -127,7 +129,7 @@
+   }
+ 
+   bool IsUbuntu() const {
+-    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuKinetic;
++    return DistroVal >= UbuntuHardy && DistroVal <= UbuntuMantic;
+   }
+ 
+   bool IsAlpineLinux() const { return DistroVal == AlpineLinux; }
+--- a/clang/lib/Driver/Distro.cpp
++++ b/clang/lib/Driver/Distro.cpp
+@@ -92,6 +92,8 @@
+                     .Case("impish", Distro::UbuntuImpish)
+                     .Case("jammy", Distro::UbuntuJammy)
+                     .Case("kinetic", Distro::UbuntuKinetic)
++                    .Case("lunar", Distro::UbuntuLunar)
++                    .Case("mantic", Distro::UbuntuMantic)
+                     .Default(Distro::UnknownDistro);
+   return Version;
+ }