diff --git a/clang-shlib-symbol-versioning.patch b/clang-shlib-symbol-versioning.patch
new file mode 100644
index 0000000..a3aa55e
--- /dev/null
+++ b/clang-shlib-symbol-versioning.patch
@@ -0,0 +1,26 @@
+diff --git a/clang/tools/clang-shlib/CMakeLists.txt b/clang/tools/clang-shlib/CMakeLists.txt
+index 298d3a9d18fe..830f2b138ffa 100644
+--- a/clang/tools/clang-shlib/CMakeLists.txt
++++ b/clang/tools/clang-shlib/CMakeLists.txt
+@@ -48,6 +48,14 @@ add_clang_library(clang-cpp
+                   ${_OBJECTS}
+                   LINK_LIBS
+                   ${_DEPS})
++
++configure_file(simple_version_script.map.in simple_version_script.map)
++
++if (NOT LLVM_LINKER_IS_SOLARISLD AND NOT MINGW)
++  # Solaris ld does not accept global: *; so there is no way to version *all* global symbols
++  target_link_options(clang-cpp PRIVATE LINKER:--version-script,${CMAKE_CURRENT_BINARY_DIR}/simple_version_script.map)
++endif()
++
+ # Optimize function calls for default visibility definitions to avoid PLT and
+ # reduce dynamic relocations.
+ if (NOT APPLE AND NOT MINGW AND NOT LLVM_LINKER_IS_SOLARISLD_ILLUMOS)
+diff --git a/clang/tools/clang-shlib/simple_version_script.map.in b/clang/tools/clang-shlib/simple_version_script.map.in
+new file mode 100644
+index 000000000000..cb2306d1f596
+--- /dev/null
++++ b/clang/tools/clang-shlib/simple_version_script.map.in
+@@ -0,0 +1 @@
++@LLVM_SHLIB_SYMBOL_VERSION@ { global: *; };
diff --git a/llvm19.changes b/llvm19.changes
index 51f0487..a54ca53 100644
--- a/llvm19.changes
+++ b/llvm19.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Nov 16 22:38:02 UTC 2024 - Aaron Puchert <aaronpuchert@alice-dsl.net>
+
+- Apply clang-shlib-symbol-versioning.patch to add symbol versions
+  to libclang-cpp.so similar to libLLVM.so. This is required when
+  multiple versions of the library are loaded into the same
+  process. (boo#1219405, boo#1221183, boo#1233220)
+
 -------------------------------------------------------------------
 Wed Nov  6 15:24:59 UTC 2024 - Michal Suchanek <msuchanek@suse.de>
 
diff --git a/llvm19.spec b/llvm19.spec
index 227acb6..58e4f30 100644
--- a/llvm19.spec
+++ b/llvm19.spec
@@ -438,6 +438,8 @@ Patch28:        llvm-fix-cov-test-i586.patch
 Patch29:        clang-fix-modules-test-riscv.patch
 # PATCH-FIX-UPSTREAM: Test using avx512f requires x86 target.
 Patch30:        clang-fix-openmp-test-non-x86.patch
+# PATCH-FIX-UPSTREAM: Use symbol versioning also for libclang-cpp.so.
+Patch31:        clang-shlib-symbol-versioning.patch
 BuildRequires:  %{python_pkg}-base >= 3.8
 BuildRequires:  binutils-devel >= 2.21.90
 BuildRequires:  cmake >= 3.13.4
@@ -890,6 +892,7 @@ pushd clang-%{_version}.src
 %patch -P 27 -p2
 %patch -P 29 -p2
 %patch -P 30 -p2
+%patch -P 31 -p2
 
 # We hardcode openSUSE
 rm unittests/Driver/DistroTest.cpp