diff --git a/debian/patches/series b/debian/patches/series
index fda038f5..1faf4424 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -148,6 +148,8 @@ compilerrt-builtins-arch-fix-armhf.diff
 compilerrt-build-scudo-standalone-option.diff
 wasm-ld-path.diff
 python3-scan-build.py
+wasm-compiler-rt-default.diff
+issue-54242.diff
 revert-update-doc.diff
 fix-typo.diff
 ubuntu-kinetic.patch
diff --git a/debian/patches/wasm-compiler-rt-default.diff b/debian/patches/wasm-compiler-rt-default.diff
new file mode 100644
index 00000000..351fcc79
--- /dev/null
+++ b/debian/patches/wasm-compiler-rt-default.diff
@@ -0,0 +1,31 @@
+--- a/clang/lib/Driver/ToolChains/WebAssembly.cpp
++++ b/clang/lib/Driver/ToolChains/WebAssembly.cpp
+@@ -369,6 +369,18 @@ ToolChain::RuntimeLibType WebAssembly::G
+   return ToolChain::RLT_CompilerRT;
+ }
+ 
++ToolChain::RuntimeLibType WebAssembly::GetRuntimeLibType(
++    const ArgList &Args) const {
++  if (Arg *A = Args.getLastArg(options::OPT_rtlib_EQ)) {
++    StringRef Value = A->getValue();
++    if (Value != "compiler-rt")
++      getDriver().Diag(clang::diag::err_drv_unsupported_rtlib_for_platform)
++          << Value << "WebAssembly";
++  }
++
++  return ToolChain::RLT_CompilerRT;
++}
++
+ ToolChain::CXXStdlibType
+ WebAssembly::GetCXXStdlibType(const ArgList &Args) const {
+   if (Arg *A = Args.getLastArg(options::OPT_stdlib_EQ)) {
+--- a/clang/lib/Driver/ToolChains/WebAssembly.h
++++ b/clang/lib/Driver/ToolChains/WebAssembly.h
+@@ -61,6 +61,7 @@ private:
+                         llvm::opt::ArgStringList &CC1Args,
+                         Action::OffloadKind DeviceOffloadKind) const override;
+   RuntimeLibType GetDefaultRuntimeLibType() const override;
++  RuntimeLibType GetRuntimeLibType(const llvm::opt::ArgList &Args) const override;
+   CXXStdlibType GetCXXStdlibType(const llvm::opt::ArgList &Args) const override;
+   void
+   AddClangSystemIncludeArgs(const llvm::opt::ArgList &DriverArgs,