diff --git a/mps/src/w3almv.nmk b/mps/src/w3almv.nmk
index dce2674b82d..24eac7a8260 100644
--- a/mps/src/w3almv.nmk
+++ b/mps/src/w3almv.nmk
@@ -1,6 +1,6 @@
 # ==== NTI3MV NMAKE FILE ====
 #
-# $HopeName: MMsrc!ntalmv.nmk(trunk.1) $
+# $HopeName: MMsrc!ntalmv.nmk(trunk.2) $
 #
 # Copyright (C) 1995 Harlequin Group, all rights reserved
 #
@@ -26,7 +26,7 @@ TESTLIB = <testlib>
 
 # ==== ALMOST GENERIC PRODUCT BUILD FOR NMAKE ====
 #
-# $HopeName: MMsrc!ntalmv.nmk(trunk.1) $
+# $HopeName: MMsrc!ntalmv.nmk(trunk.2) $
 #
 # Copyright (C) 1995 Harlequin Group, all rights reserved
 #
@@ -148,7 +148,7 @@ CFCV = /DTARGET_VAR_DP /Z7
 # LINKER FLAGS
 # %%VARIETY: define a macro containing the flags for the new variety
 LINKER = link
-LINKFLAGSCOMMON = /nologo
+LINKFLAGSCOMMON = /nologo /PDB:NONE
 LFDF = /DEBUG:full /DEBUGTYPE:cv
 LFDP = /DEBUG:full /DEBUGTYPE:cv
 LFDS = /DEBUG:full /DEBUGTYPE:cv
@@ -387,13 +387,13 @@ $(PFM)\$(VARIETY)\mmdw.lib: $(MPMOBJ) $(AMCOBJ) $(DWOBJ)
 	$(ECHO) $@
 	@if not exist $(PFM) mkdir $(PFM)
 	@if not exist $(PFM)\$(VARIETY) mkdir $(PFM)\$(VARIETY)
-	cl /c $(CFLAGS) /FR$*.sbr /Fd$(PFM)\$(VARIETY)\$(<:.obj=.pdb) /Fo$@ $<
+	cl /c $(CFLAGS) /Fd$(PFM)\$(VARIETY)\$(<:.obj=.pdb) /Fo$@ $<
 
 {}.asm{$(PFM)\$(VARIETY)}.obj:
 	$(ECHO) $@
 	@if not exist $(PFM) mkdir $(PFM)
 	@if not exist $(PFM)\$(VARIETY) mkdir $(PFM)\$(VARIETY)
-	ml /nologo /c /coff /FR$*.sbr  /Fo$@ $<
+	ml /nologo /c /coff /Fo$@ $<
 
 # Coverage files
 {$(PFM)\$(VARIETY)}.exe{$(PFM)\$(VARIETY)}.cov:
diff --git a/mps/src/w3ppmv.nmk b/mps/src/w3ppmv.nmk
index 5a61e07f79b..378a5c09531 100644
--- a/mps/src/w3ppmv.nmk
+++ b/mps/src/w3ppmv.nmk
@@ -1,6 +1,6 @@
 # ==== NTI3MV NMAKE FILE ====
 #
-# $HopeName: MMsrc!ntppmv.nmk(MMdevel_drj_swint.1) $
+# $HopeName: MMsrc!ntppmv.nmk(trunk.2) $
 #
 # Copyright (C) 1995 Harlequin Group, all rights reserved
 #
@@ -26,7 +26,7 @@ TESTLIB = <testlib>
 
 # ==== ALMOST GENERIC PRODUCT BUILD FOR NMAKE ====
 #
-# $HopeName: MMsrc!ntppmv.nmk(MMdevel_drj_swint.1) $
+# $HopeName: MMsrc!ntppmv.nmk(trunk.2) $
 #
 # Copyright (C) 1995 Harlequin Group, all rights reserved
 #
@@ -148,7 +148,7 @@ CFCV = /DTARGET_VAR_DP /Z7
 # LINKER FLAGS
 # %%VARIETY: define a macro containing the flags for the new variety
 LINKER = link
-LINKFLAGSCOMMON = /nologo
+LINKFLAGSCOMMON = /nologo /PDB:NONE
 LFDF = /DEBUG:full /DEBUGTYPE:cv
 LFDP = /DEBUG:full /DEBUGTYPE:cv
 LFDS = /DEBUG:full /DEBUGTYPE:cv
@@ -387,13 +387,13 @@ $(PFM)\$(VARIETY)\mmdw.lib: $(MPMOBJ) $(AMCOBJ) $(DWOBJ)
 	$(ECHO) $@
 	@if not exist $(PFM) mkdir $(PFM)
 	@if not exist $(PFM)\$(VARIETY) mkdir $(PFM)\$(VARIETY)
-	cl /c $(CFLAGS) /FR$*.sbr /Fd$(PFM)\$(VARIETY)\$(<:.obj=.pdb) /Fo$@ $<
+	cl /c $(CFLAGS) /Fd$(PFM)\$(VARIETY)\$(<:.obj=.pdb) /Fo$@ $<
 
 {}.asm{$(PFM)\$(VARIETY)}.obj:
 	$(ECHO) $@
 	@if not exist $(PFM) mkdir $(PFM)
 	@if not exist $(PFM)\$(VARIETY) mkdir $(PFM)\$(VARIETY)
-	ml /nologo /c /coff /FR$*.sbr  /Fo$@ $<
+	ml /nologo /c /coff /Fo$@ $<
 
 # Coverage files
 {$(PFM)\$(VARIETY)}.exe{$(PFM)\$(VARIETY)}.cov: