diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk
index 610d9ef2a32..a1382939e50 100644
--- a/mozilla/config/config.mk
+++ b/mozilla/config/config.mk
@@ -239,7 +239,7 @@ TAR		= tar
 endif
 endif
 
-ifneq (,$(filter OpenVMS OSF1,$(OS_ARCH)))
+ifeq ($(OS_ARCH),OpenVMS)
 include $(topsrcdir)/config/$(OS_ARCH).mk
 endif
 
diff --git a/mozilla/configure.in b/mozilla/configure.in
index e9068abc37d..4ff1879dd0b 100644
--- a/mozilla/configure.in
+++ b/mozilla/configure.in
@@ -736,6 +736,8 @@ alpha*-*-osf*)
     if test "$GNU_CC"; then
 	DSO_LDOPTS='-shared -Wl,-soname -Wl,$@'
     else
+	MOZ_DEBUG_FLAGS='-gall'
+	ASFLAGS='-I$(topsrcdir)/xpcom/reflect/xptcall/public -g -std1'
 	CFLAGS="$CFLAGS -std1 -ieee_with_inexact"
 	CXXFLAGS="$CXXFLAGS -std1 -ieee_with_inexact -noexceptions"
 	DSO_LDOPTS='-shared -msym -expect_unresolved \* -soname $@'