diff --git a/debian/changelog b/debian/changelog
index 8cb902ea..03058bca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-llvm-toolchain-15 (1:15.0.3-3) UNRELEASED; urgency=medium
+llvm-toolchain-15 (1:15.0.4-1) unstable; urgency=medium
 
   [ Jordan Justen ]
   * d/rules: Rename LLVM_SPIR_VERSION to LLVM_SPIRV_VERSION
@@ -10,7 +10,11 @@ llvm-toolchain-15 (1:15.0.3-3) UNRELEASED; urgency=medium
   * d/rules: Check for previous version of llvm-spirv as well
   * d/control: Add llvm-spirv-14 as an alternative to llvm-spirv-15
 
- -- Jordan Justen <jljusten@debian.org>  Sun, 30 Oct 2022 00:26:40 -0700
+  [ Sylvestre Ledru ]
+  * New upstream release (Closes: #1023455)
+  * Cherry-pick patches to fix the FTBFS with swig + lldb (Closes: #1023444)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 02 Nov 2022 08:50:23 +0100
 
 llvm-toolchain-15 (1:15.0.3-2) unstable; urgency=medium
 
diff --git a/debian/patches/lldb-swig-2.diff b/debian/patches/lldb-swig-2.diff
new file mode 100644
index 00000000..54763838
--- /dev/null
+++ b/debian/patches/lldb-swig-2.diff
@@ -0,0 +1,13 @@
+diff --git a/lldb/bindings/python/python-typemaps.swig b/lldb/bindings/python/python-typemaps.swig
+index 203be803d2ebd..11f68d59ae7be 100644
+--- a/lldb/bindings/python/python-typemaps.swig
++++ b/lldb/bindings/python/python-typemaps.swig
+@@ -435,7 +435,7 @@ template <> bool SetNumberFromPyObject<double>(double &number, PyObject *obj) {
+ 
+ %typemap(out) lldb::FileSP {
+   $result = nullptr;
+-  lldb::FileSP &sp = $1;
++  const lldb::FileSP &sp = $1;
+   if (sp) {
+     PythonFile pyfile = unwrapOrSetPythonException(PythonFile::FromFile(*sp));
+     if (!pyfile.IsValid())
diff --git a/debian/patches/lldb-swig.diff b/debian/patches/lldb-swig.diff
new file mode 100644
index 00000000..93b54528
--- /dev/null
+++ b/debian/patches/lldb-swig.diff
@@ -0,0 +1,26 @@
+diff --git a/lldb/bindings/CMakeLists.txt b/lldb/bindings/CMakeLists.txt
+index c8aa0bcf96817..9eed2f1e62999 100644
+--- a/lldb/bindings/CMakeLists.txt
++++ b/lldb/bindings/CMakeLists.txt
+@@ -26,8 +26,6 @@ set(SWIG_COMMON_FLAGS
+   -features autodoc
+   -I${LLDB_SOURCE_DIR}/include
+   -I${CMAKE_CURRENT_SOURCE_DIR}
+-  -D__STDC_LIMIT_MACROS
+-  -D__STDC_CONSTANT_MACROS
+   ${DARWIN_EXTRAS}
+ )
+ 
+diff --git a/lldb/bindings/interfaces.swig b/lldb/bindings/interfaces.swig
+index fb75513a0df1b..d984711bbd8a2 100644
+--- a/lldb/bindings/interfaces.swig
++++ b/lldb/bindings/interfaces.swig
+@@ -1,8 +1,5 @@
+ /* Various liblldb typedefs that SWIG needs to know about.  */
+ #define __extension__ /* Undefine GCC keyword to make Swig happy when processing glibc's stdint.h. */
+-/* The ISO C99 standard specifies that in C++ implementations limit macros such
+-   as INT32_MAX should only be defined if __STDC_LIMIT_MACROS is. */
+-#define __STDC_LIMIT_MACROS
+ %include "stdint.i"
+ 
+ %include "lldb/lldb-defines.h"
diff --git a/debian/patches/series b/debian/patches/series
index 3326826c..0ea41552 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -154,3 +154,5 @@ bolt.patch
 bolt-disable-emit-relocs.patch
 D124841-fix-powerpc-miscompile.patch
 mips/mips-assert-size.diff
+lldb-swig.diff
+lldb-swig-2.diff