diff --git a/configure.ac b/configure.ac
index 52461372d428..f3761d0eeca6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5178,7 +5178,7 @@ if test "$enable_split_debug" != no; then
     fi
     if test -n "$use_split_debug"; then
         if test "$_os" = "Emscripten"; then
-            TEST_CC_FLAG='-gsplit-dwarf -gpubnames'
+            TEST_CC_FLAG='-gseparate-dwarf -gsplit-dwarf -gpubnames'
         else
             TEST_CC_FLAG=-gsplit-dwarf
         fi
diff --git a/instsetoo_native/CustomTarget_emscripten-install.mk b/instsetoo_native/CustomTarget_emscripten-install.mk
index 6f89d5e37fe4..607217742413 100644
--- a/instsetoo_native/CustomTarget_emscripten-install.mk
+++ b/instsetoo_native/CustomTarget_emscripten-install.mk
@@ -19,7 +19,9 @@ emscripten_install_files := \
     soffice.js \
     soffice.wasm \
     $(if $(EMSCRIPTEN_WORKERJS),soffice.worker.js) \
-    $(if $(ENABLE_SYMBOLS_FOR),soffice.wasm.dwp) \
+    $(if $(ENABLE_SYMBOLS_FOR), \
+        soffice.wasm.debug.wasm \
+        soffice.wasm.debug.wasm.dwp) \
     $(if $(DISABLE_GUI),, \
         qt_soffice.html \
         qtloader.js \
diff --git a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
index 462992588abb..17bc0ba3f22d 100644
--- a/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/EMSCRIPTEN_INTEL_GCC.mk
@@ -76,7 +76,7 @@ gb_LINKERSTRIPDEBUGFLAGS :=
 gb_DEBUGINFO_FLAGS = -g
 
 ifeq ($(HAVE_EXTERNAL_DWARF),TRUE)
-gb_DEBUGINFO_FLAGS += -gsplit-dwarf -gpubnames
+gb_DEBUGINFO_FLAGS += -gseparate-dwarf -gsplit-dwarf -gpubnames
 endif
 
 gb_COMPILEROPTFLAGS := -O3
@@ -92,7 +92,8 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\
         $(patsubst %.lib,%.linkdeps,$(3)) \
         $(patsubst %.lib,%.wasm,$(3)) \
         $(if $(EMSCRIPTEN_WORKERJS),$(patsubst %.lib,%.worker.js,$(3))) \
-        $(patsubst %.lib,%.wasm.dwp,$(3)) \
+        $(patsubst %.lib,%.wasm.debug.wasm,$(3)) \
+        $(patsubst %.lib,%.wasm.debug.wasm.dwp,$(3)) \
 )
 
 endef
@@ -102,7 +103,8 @@ $(call gb_LinkTarget_add_auxtargets,$(2),\
         $(patsubst %.lib,%.linkdeps,$(3)) \
         $(patsubst %.lib,%.wasm,$(3)) \
         $(if $(EMSCRIPTEN_WORKERJS),$(patsubst %.lib,%.worker.js,$(3))) \
-        $(patsubst %.lib,%.wasm.dwp,$(3)) \
+        $(patsubst %.lib,%.wasm.debug.wasm,$(3)) \
+        $(patsubst %.lib,%.wasm.debug.wasm.dwp,$(3)) \
 )
 
 endef
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 2f8f4df9603b..1c22db269d34 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -172,7 +172,7 @@ $(call gb_Helper_abbreviate_dirs,\
                 ) \
 		-o $(1) \
 	$(if $(SOVERSIONSCRIPT),&& ln -sf ../../program/$(notdir $(1)) $(ILIBTARGET)) \
-	$(if $(filter EMSCRIPTEN,$(OS)),$(if $(filter TRUE,$(HAVE_EXTERNAL_DWARF)),&& emdwp -e $(patsubst %$(gb_Executable_EXT),%.wasm,$(1)) -o $(patsubst %$(gb_Executable_EXT),%.wasm.dwp,$(1)))) \
+	$(if $(filter EMSCRIPTEN,$(OS)),$(if $(filter TRUE,$(HAVE_EXTERNAL_DWARF)),&& emdwp -e $(patsubst %$(gb_Executable_EXT),%.wasm.debug.wasm,$(1)) -o $(patsubst %$(gb_Executable_EXT),%.wasm.debug.wasm.dwp,$(1)))) \
 	$(if $(call gb_LinkTarget__WantLock,$(2)),; RC=$$? ; rm -f $(gb_LinkTarget__Lock); if test $$RC -ne 0; then exit $$RC; fi))
 
 $(if $(filter Library,$(TARGETTYPE)), $(call gb_Helper_abbreviate_dirs,\