diff --git a/external/msc-externals/Module_msc-externals.mk b/external/msc-externals/Module_msc-externals.mk
index 1caa327fc64f..275c9ff07c80 100644
--- a/external/msc-externals/Module_msc-externals.mk
+++ b/external/msc-externals/Module_msc-externals.mk
@@ -10,7 +10,7 @@
 $(eval $(call gb_Module_Module,msc-externals))
 
 $(eval $(call gb_Module_add_targets,msc-externals,\
-	Package_dbghelp \
+	$(if $(ENABLE_CRASHDUMP),Package_dbghelp) \
 	$(if $(MSM_PATH),Package_msms) \
 	Package_msvc_dlls \
 	$(if $(filter YES,$(WITH_MOZAB4WIN)),Package_msvc80_dlls) \
diff --git a/external/msc-externals/Package_dbghelp.mk b/external/msc-externals/Package_dbghelp.mk
index f6f684a7c077..d039b07d42a5 100644
--- a/external/msc-externals/Package_dbghelp.mk
+++ b/external/msc-externals/Package_dbghelp.mk
@@ -9,8 +9,6 @@
 
 $(eval $(call gb_Package_Package,dbghelp,$(TARFILE_LOCATION)))
 
-$(eval $(call gb_Package_set_outdir,dbghelp,$(OUTDIR)))
-
-$(eval $(call gb_Package_add_file,dbghelp,bin/dbghelp.dll,$(DBGHELP_DLL)))
+$(eval $(call gb_Package_add_file,dbghelp,$(LIBO_LIB_FOLDER)/dbghelp.dll,$(DBGHELP_DLL)))
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab: