diff --git a/mps/src/comm.gmk b/mps/src/comm.gmk
index 610774e7e06..37e9cfe98b3 100644
--- a/mps/src/comm.gmk
+++ b/mps/src/comm.gmk
@@ -1,9 +1,9 @@
 # impl.gmk.comm: COMMON GNUMAKEFILE FRAGMENT
 #
-# $HopeName: MMsrc!comm.gmk(trunk.18) $
+# $HopeName: MMsrc!comm.gmk(trunk.19) $
 # Copyright (C) 1995,1996,1997 Harlequin Group, all rights reserved
 #
-# DSCRIPTION
+# DESCRIPTION
 #
 # This makefile fragment is included in more specific makefiles for
 # platforms which use GNU make.
@@ -166,6 +166,10 @@ LOOBJ = $(LO:%.c=$(PFM)/$(VARIETY)/%.o)
 LODEP = $(LO:%.c=$(PFM)/$(VARIETY)/%.d)
 DWOBJ = $(DW:%.c=$(PFM)/$(VARIETY)/%.o)
 DWDEP = $(DW:%.c=$(PFM)/$(VARIETY)/%.d)
+POOLNOBJ = $(POOLN:%.c=$(PFM)/$(VARIETY)/%.o)
+POOLNDEP = $(POOLN:%.c=$(PFM)/$(VARIETY)/%.d)
+ARENAANOBJ = $(ARENAAN:%.c=$(PFM)/$(VARIETY)/%.o)
+ARENAANDEP = $(ARENAAN:%.c=$(PFM)/$(VARIETY)/%.d)
 SWOBJ = $(SW:%.c=$(PFM)/$(VARIETY)/%.o)
 # The following hack for SWDEP only creates those dependencies when
 # mmsw.a is being built.
@@ -309,16 +313,15 @@ $(PFM)/$(VARIETY)/dwstress: $(PFM)/$(VARIETY)/dwstress.o \
 	$(MPMOBJ) $(AMCOBJ) $(DWOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/poolncv: $(PFM)/$(VARIETY)/poolncv.o \
-	$(PFM)/$(VARIETY)/pooln.o \
-	$(MPMOBJ) $(TESTLIBOBJ)
+	$(MPMOBJ) $(TESTLIBOBJ) $(POOLNOBJ) $(ARENAANOBJ)
 
 $(PFM)/$(VARIETY)/qs: $(PFM)/$(VARIETY)/qs.o \
 	$(AMCOBJ) $(MPMOBJ) $(TESTLIBOBJ)
 
 $(PFM)/$(VARIETY)/arenacv: $(PFM)/$(VARIETY)/arenacv.o \
-	$(MPMOBJ) $(TESTLIBOBJ)
+	$(MPMOBJ) $(TESTLIBOBJ) $(ARENAANOBJ)
 
-$(PFM)/$(VARIETY)/mps.a: $(MPMOBJ) $(AMCOBJ) $(LOOBJ) $(PFM)/$(VARIETY)/pooln.o
+$(PFM)/$(VARIETY)/mps.a: $(MPMOBJ) $(AMCOBJ) $(LOOBJ) $(POOLNOBJ)
 
 $(PFM)/$(VARIETY)/mpm.a: $(MPMOBJ)
 
@@ -373,7 +376,8 @@ $(PFM)/$(VARIETY)/%.d: %.c
 ifdef VARIETY
 ifdef TARGET
 # %%PART: Add the dependency file macro for the new part here.
-include $(MPMDEP) $(AMSDEP) $(AMCDEP) $(LODEP) $(SWDEP)
+include $(MPMDEP) $(AMSDEP) $(AMCDEP) $(LODEP) $(SWDEP) \
+	$(AWLDEP) $(DWDEP) $(POOLNDEP) $(ARENAANDEP) $(TESTLIBDEP)
 endif
 endif
 
diff --git a/mps/src/w3almv.nmk b/mps/src/w3almv.nmk
index 00d11b220f7..e63ae4262dd 100644
--- a/mps/src/w3almv.nmk
+++ b/mps/src/w3almv.nmk
@@ -1,6 +1,6 @@
 # ==== W3ALMV NMAKE FILE ====
 #
-# $HopeName: MMsrc!w3almv.nmk(trunk.19) $
+# $HopeName: MMsrc!w3almv.nmk(trunk.20) $
 #
 # Copyright (C) 1995,1997 Harlequin Group, all rights reserved
 #
@@ -9,7 +9,7 @@ PFM = w3almv
 PFMDEFS = /DWIN32 /D_WINDOWS
 
 MPM = <assert> <ring> <mpm> <bt> \
-      <arenavm> <arenaan> <arenacl> <arena> <pool> <poolmfs> \
+      <arenavm> <arenacl> <arena> <pool> <poolmfs> \
       <poolmv> <root> <format> <buffer> <lockw3> \
       <ref> <trace> <protw3> <shield> \
       <than> <ssan> <mpsi> <mpsiw3> <ld> <vmw3> \
@@ -26,6 +26,8 @@ AMS = <poolams>
 AWL = <poolawl>
 LO  = <lo>
 DW  = <fmtdy>
+POOLN = <pooln>
+ARENAAN = <arenaan>
 TESTLIB = <testlib>
 
 
@@ -61,6 +63,10 @@ LOOBJ0 = $(LO:<=w3almv\he\)
 LOOBJ = $(LOOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3almv\he\)
 DWOBJ = $(DWOBJ0:>=.obj)
+POOLNOBJ0 = $(POOLN:<=w3almv\he\)
+POOLNOBJ = $(POOLNOBJ0:>=.obj)
+ARENAANOBJ0 = $(ARENAAN:<=w3almv\he\)
+ARENAANOBJ = $(ARENAANOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3almv\he\)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
@@ -84,6 +90,10 @@ LOOBJ0 = $(LO:<=w3almv\ce\)
 LOOBJ = $(LOOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3almv\ce\)
 DWOBJ = $(DWOBJ0:>=.obj)
+POOLNOBJ0 = $(POOLN:<=w3almv\ce\)
+POOLNOBJ = $(POOLNOBJ0:>=.obj)
+ARENAANOBJ0 = $(ARENAAN:<=w3almv\ce\)
+ARENAANOBJ = $(ARENAANOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3almv\ce\)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
@@ -107,6 +117,10 @@ LOOBJ0 = $(LO:<=w3almv\hi\)
 LOOBJ = $(LOOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3almv\hi\)
 DWOBJ = $(DWOBJ0:>=.obj)
+POOLNOBJ0 = $(POOLN:<=w3almv\hi\)
+POOLNOBJ = $(POOLNOBJ0:>=.obj)
+ARENAANOBJ0 = $(ARENAAN:<=w3almv\hi\)
+ARENAANOBJ = $(ARENAANOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3almv\hi\)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
@@ -130,6 +144,10 @@ LOOBJ0 = $(LO:<=w3almv\ci\)
 LOOBJ = $(LOOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3almv\ci\)
 DWOBJ = $(DWOBJ0:>=.obj)
+POOLNOBJ0 = $(POOLN:<=w3almv\ci\)
+POOLNOBJ = $(POOLNOBJ0:>=.obj)
+ARENAANOBJ0 = $(ARENAAN:<=w3almv\ci\)
+ARENAANOBJ = $(ARENAANOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3almv\ci\)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
@@ -153,6 +171,10 @@ LOOBJ0 = $(LO:<=w3almv\ti\)
 LOOBJ = $(LOOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3almv\ti\)
 DWOBJ = $(DWOBJ0:>=.obj)
+POOLNOBJ0 = $(POOLN:<=w3almv\ti\)
+POOLNOBJ = $(POOLNOBJ0:>=.obj)
+ARENAANOBJ0 = $(ARENAAN:<=w3almv\ti\)
+ARENAANOBJ = $(ARENAANOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3almv\ti\)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
@@ -176,6 +198,10 @@ LOOBJ0 = $(LO:<=w3almv\wi\)
 LOOBJ = $(LOOBJ0:>=.obj)
 DWOBJ0 = $(DW:<=w3almv\wi\)
 DWOBJ = $(DWOBJ0:>=.obj)
+POOLNOBJ0 = $(POOLN:<=w3almv\wi\)
+POOLNOBJ = $(POOLNOBJ0:>=.obj)
+ARENAANOBJ0 = $(ARENAAN:<=w3almv\wi\)
+ARENAANOBJ = $(ARENAANOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3almv\wi\)
 TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
@@ -201,6 +227,10 @@ TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 #MRGOBJ = $(MRGOBJ0:>=.obj)
 #DWOBJ0 = $(DW:<=w3almv\cv\)
 #DWOBJ = $(DWOBJ0:>=.obj)
+#POOLNOBJ0 = $(POOLN:<=w3almv\cv\)
+#POOLNOBJ = $(POOLNOBJ0:>=.obj)
+#ARENAANOBJ0 = $(ARENAAN:<=w3almv\cv\)
+#ARENAANOBJ = $(ARENAANOBJ0:>=.obj)
 #TESTLIBOBJ0 = $(TESTLIB:<=w3almv\cv\)
 #TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)