diff --git a/build/unix/vms/libxpcom_dbg_symvec.opt b/build/unix/vms/libxpcom_dbg_symvec.opt
new file mode 100755
index 000000000000..6310622e3a87
--- /dev/null
+++ b/build/unix/vms/libxpcom_dbg_symvec.opt
@@ -0,0 +1,26 @@
+! Fixed section of symbol vector for LIBXPCOM (debug)
+!
+GSMATCH=LEQUAL,2,2
+case_sensitive=YES
+!
+! --------------------------------------------------------------------------
+! Ident 2,1 introduced for M0.9.4
+! --------------------------------------------------------------------------
+!
+SYMBOL_VECTOR=(CXX$assgnfrmhlpr13nsCMPt3okfmbt=PROCEDURE)
+SYMBOL_VECTOR=(CXX$clk16nsQeryntrfcxnk434ulf1t=PROCEDURE)
+SYMBOL_VECTOR=(CXX$clk17nsGtSrvcByCDxnk20ffnk0=PROCEDURE)
+SYMBOL_VECTOR=(SPARE) ! __dt__13nsCOMPtr_basexv not present in debug
+!
+! --------------------------------------------------------------------------
+! Ident 2,2 introduced for Mozilla 1.1 (and hence CSWB post 1.0).
+! --------------------------------------------------------------------------
+!
+SYMBOL_VECTOR=(iid__L0__GetIID__9nsIModulexv=DATA)
+SYMBOL_VECTOR=(iid__L0__GetIID__10nsIFactoryxv=DATA)
+SYMBOL_VECTOR=(CXX$iidL0GtID11nsRnnblxv3t05kum=DATA)
+SYMBOL_VECTOR=(CXX$GtGlblSrvcMngr16nsSr1vcg2p7=PROCEDURE)
+!
+! --------------------------------------------------------------------------
+! End of fixed section
+! --------------------------------------------------------------------------
diff --git a/config/rules.mk b/config/rules.mk
index eeb726c40302..bcb5c8f56420 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -303,10 +303,14 @@ endif
 endif
 
 ifeq ($(OS_ARCH),OpenVMS)
-GARBAGE			+= $(wildcard *.c*_defines) 
+GARBAGE			+= $(wildcard *.*_defines)
 ifdef SHARED_LIBRARY
 VMS_SYMVEC_FILE		= $(SHARED_LIBRARY:$(DLL_SUFFIX)=_symvec.opt)
-VMS_SYMVEC_FILE_MODULE	= $(topsrcdir)/build/unix/vms/$(notdir $(VMS_SYMVEC_FILE))
+ifdef MOZ_DEBUG
+VMS_SYMVEC_FILE_MODULE	= $(topsrcdir)/build/unix/vms/$(notdir $(SHARED_LIBRARY:$(DLL_SUFFIX)=_dbg_symvec.opt))
+else
+VMS_SYMVEC_FILE_MODULE	= $(topsrcdir)/build/unix/vms/$(notdir $(SHARED_LIBRARY:$(DLL_SUFFIX)=_symvec.opt))
+endif
 VMS_SYMVEC_FILE_COMP	= $(topsrcdir)/build/unix/vms/component_symvec.opt
 GARBAGE			+= $(VMS_SYMVEC_FILE)
 ifdef IS_COMPONENT