diff --git a/metrowerks-tools.jam b/metrowerks-tools.jam
index 539bc86eb..7431bde67 100644
--- a/metrowerks-tools.jam
+++ b/metrowerks-tools.jam
@@ -39,8 +39,10 @@ flags metrowerks CFLAGS <user-interface>console/<runtime-link>dynamic : -prefix
 
 if $(BOOST_CODEWARRIOR_7)
 {
-  flags metrowerks STDLIBS <runtime-link>static : MSL_C_x86.lib;MSL_Runtime_x86.lib;msl_c++_x86.lib;gdi32.lib;user32.lib;kernel32.lib ;
-  flags metrowerks STDLIBS <runtime-link>dynamic : MSL_All-DLL_x86.lib;gdi32.lib;user32.lib;kernel32.lib ;
+  flags metrowerks STDLIBS <runtime-link>static/<runtime-build>release : MSL_C_x86.lib;MSL_Runtime_x86.lib;msl_c++_x86.lib;gdi32.lib;user32.lib;kernel32.lib ;
+  flags metrowerks STDLIBS <runtime-link>dynamic/<runtime-build>release : MSL_All-DLL_x86.lib;gdi32.lib;user32.lib;kernel32.lib ;
+  flags metrowerks STDLIBS <runtime-link>static/<runtime-build>debug : MSL_C_x86_D.lib;MSL_Runtime_x86_D.lib;msl_c++_x86_D.lib;gdi32.lib;user32.lib;kernel32.lib ;
+  flags metrowerks STDLIBS <runtime-link>dynamic/<runtime-build>debug : MSL_All-DLL_x86_D.lib;gdi32.lib;user32.lib;kernel32.lib ;
 }
 else
 {
@@ -70,26 +72,20 @@ flags metrowerks STDHDRS : $(METROWERKS_INCLUDE_ROOT)$(SLASH)$(gMETROWERKS_STD_I
 
 rule Link-action
 {
-    IMPLIB_COMMAND on $(<) = "-implib " ; # will be "multiplied away" if not needed.
-    local command-file = $(<[1]:S=.CMD) ;
-    LOCATE on $(command-file) = $(gLOCATE($(<))) ;
-    COMMAND on $(<) = @ ;
-    metrowerks-Link-action $(<) : $(command-file) ;
-
-    list-files $(command-file) : $(>) ;
-    DEPENDS $(<) : $(command-file) ;
-    RmTemps $(<[1]) : $(command-file) ;
+    IMPLIB_COMMAND on $(<) = "-implib " ; # will be "multiplied away" if not
+                                        # needed.
+    with-command-file metrowerks-Link-action $(<) : $(>) $(NEEDLIBS) ;
 }
 
 # Here we set the environment variable MWWinx86LibraryFiles (customize for other
 # platforms) because the alternatives for getting the right libraries on the
 # command-line would produce enormous paths in the command-line, obscuring what
 # really happens.
-actions metrowerks-Link-action bind NEEDLIBS
+actions metrowerks-Link-action
 {
     $(METROWERKS_SETUP)
     $(METROWERKS_LINK_SETUP)$(STDLIBS)
-    mwld  -maxerrors 20 -maxwarnings 20 -export dllexport -nowraplines $(LINKFLAGS) -L$(LIBPATH) -L$(STDLIBPATH) $(IMPLIB_COMMAND)"$(<[2])" -o "$(<[1])" "$(NEEDLIBS)" $(COMMAND)"$(>)" -l$(FINDLIBS)
+    mwld  -maxerrors 20 -maxwarnings 20 -export dllexport -nowraplines $(LINKFLAGS) -L$(LIBPATH) -L$(STDLIBPATH) $(IMPLIB_COMMAND)"$(<[2])" -o "$(<[1])" @"$(>)" -l$(FINDLIBS)
 }
 
 #### Cc #####
@@ -123,7 +119,7 @@ rule Archive-action
     metrowerks-Archive-action $(<) : $(>) ;
 }
 
-actions updated together metrowerks-Archive-action
+    actions together metrowerks-Archive-action
 {
     $(METROWERKS_SETUP)
     mwld -library -o "$(<)" "$(>)"
diff --git a/v1/metrowerks-tools.jam b/v1/metrowerks-tools.jam
index 539bc86eb..7431bde67 100644
--- a/v1/metrowerks-tools.jam
+++ b/v1/metrowerks-tools.jam
@@ -39,8 +39,10 @@ flags metrowerks CFLAGS <user-interface>console/<runtime-link>dynamic : -prefix
 
 if $(BOOST_CODEWARRIOR_7)
 {
-  flags metrowerks STDLIBS <runtime-link>static : MSL_C_x86.lib;MSL_Runtime_x86.lib;msl_c++_x86.lib;gdi32.lib;user32.lib;kernel32.lib ;
-  flags metrowerks STDLIBS <runtime-link>dynamic : MSL_All-DLL_x86.lib;gdi32.lib;user32.lib;kernel32.lib ;
+  flags metrowerks STDLIBS <runtime-link>static/<runtime-build>release : MSL_C_x86.lib;MSL_Runtime_x86.lib;msl_c++_x86.lib;gdi32.lib;user32.lib;kernel32.lib ;
+  flags metrowerks STDLIBS <runtime-link>dynamic/<runtime-build>release : MSL_All-DLL_x86.lib;gdi32.lib;user32.lib;kernel32.lib ;
+  flags metrowerks STDLIBS <runtime-link>static/<runtime-build>debug : MSL_C_x86_D.lib;MSL_Runtime_x86_D.lib;msl_c++_x86_D.lib;gdi32.lib;user32.lib;kernel32.lib ;
+  flags metrowerks STDLIBS <runtime-link>dynamic/<runtime-build>debug : MSL_All-DLL_x86_D.lib;gdi32.lib;user32.lib;kernel32.lib ;
 }
 else
 {
@@ -70,26 +72,20 @@ flags metrowerks STDHDRS : $(METROWERKS_INCLUDE_ROOT)$(SLASH)$(gMETROWERKS_STD_I
 
 rule Link-action
 {
-    IMPLIB_COMMAND on $(<) = "-implib " ; # will be "multiplied away" if not needed.
-    local command-file = $(<[1]:S=.CMD) ;
-    LOCATE on $(command-file) = $(gLOCATE($(<))) ;
-    COMMAND on $(<) = @ ;
-    metrowerks-Link-action $(<) : $(command-file) ;
-
-    list-files $(command-file) : $(>) ;
-    DEPENDS $(<) : $(command-file) ;
-    RmTemps $(<[1]) : $(command-file) ;
+    IMPLIB_COMMAND on $(<) = "-implib " ; # will be "multiplied away" if not
+                                        # needed.
+    with-command-file metrowerks-Link-action $(<) : $(>) $(NEEDLIBS) ;
 }
 
 # Here we set the environment variable MWWinx86LibraryFiles (customize for other
 # platforms) because the alternatives for getting the right libraries on the
 # command-line would produce enormous paths in the command-line, obscuring what
 # really happens.
-actions metrowerks-Link-action bind NEEDLIBS
+actions metrowerks-Link-action
 {
     $(METROWERKS_SETUP)
     $(METROWERKS_LINK_SETUP)$(STDLIBS)
-    mwld  -maxerrors 20 -maxwarnings 20 -export dllexport -nowraplines $(LINKFLAGS) -L$(LIBPATH) -L$(STDLIBPATH) $(IMPLIB_COMMAND)"$(<[2])" -o "$(<[1])" "$(NEEDLIBS)" $(COMMAND)"$(>)" -l$(FINDLIBS)
+    mwld  -maxerrors 20 -maxwarnings 20 -export dllexport -nowraplines $(LINKFLAGS) -L$(LIBPATH) -L$(STDLIBPATH) $(IMPLIB_COMMAND)"$(<[2])" -o "$(<[1])" @"$(>)" -l$(FINDLIBS)
 }
 
 #### Cc #####
@@ -123,7 +119,7 @@ rule Archive-action
     metrowerks-Archive-action $(<) : $(>) ;
 }
 
-actions updated together metrowerks-Archive-action
+    actions together metrowerks-Archive-action
 {
     $(METROWERKS_SETUP)
     mwld -library -o "$(<)" "$(>)"