diff --git a/intel-win32-tools.jam b/intel-win32-tools.jam
index 3fd76f8fd..80783aec1 100644
--- a/intel-win32-tools.jam
+++ b/intel-win32-tools.jam
@@ -22,19 +22,12 @@ extends-toolset msvc ;
 
 rule Link-action
 {
-    local command-file = $(<[1]:S=.CMD) ;
-    LOCATE on $(command-file) = $(gLOCATE($(<))) ;
-    COMMAND on $(<) = @ ;
-    intel-win32-Link-action $(<) : $(command-file) ;
-
-    list-files $(command-file) : $(>) ;
-    DEPENDS $(<) : $(command-file) ;
-    RmTemps $(<[1]) : $(command-file) ;
+    with-command-file intel-win32-Link-action $(<) : $(>) $(NEEDLIBS) ;
 }
 
 actions intel-win32-Link-action bind NEEDLIBS 
 {
-    $(INTEL_TOOL_PATH)xilink /nologo $(LINKFLAGS) /PDB:"$(<[1]:S=.pdb)" /out:"$(<[1])" $(UNDEFS) /LIBPATH:$(LIBPATH) /LIBPATH:$(STDLIBPATH) "$(NEEDLIBS)" "$(FINDLIBS)" $(COMMAND)"$(>)"
+    $(INTEL_TOOL_PATH)xilink /nologo $(LINKFLAGS) /PDB:"$(<[1]:S=.pdb)" /out:"$(<[1])" $(UNDEFS) /LIBPATH:$(LIBPATH) /LIBPATH:$(STDLIBPATH) "$(FINDLIBS)" @"$(>)"
 }
 
 #### Cc #####
diff --git a/msvc-tools.jam b/msvc-tools.jam
index 40d083293..d35bde2f5 100644
--- a/msvc-tools.jam
+++ b/msvc-tools.jam
@@ -55,19 +55,12 @@ flags msvc LINKFLAGS <target-type>DLL : /DLL ;
 
 rule Link-action
 {
-    local command-file = $(<[1]:S=.CMD) ;
-    LOCATE on $(command-file) = $(gLOCATE($(<))) ;
-    COMMAND on $(<) = @ ;
-    msvc-Link-action $(<) : $(command-file) ;
-
-    list-files $(command-file) : $(>) ;
-    DEPENDS $(<) : $(command-file) ;
-    RmTemps $(<[1]) : $(command-file) ;
+    with-command-file msvc-Link-action $(<) : $(>) $(NEEDLIBS) ;
 }
 
 actions together msvc-Link-action bind NEEDLIBS
 {
-    $(MSVC_TOOL_PATH)link /nologo $(LINKFLAGS) /PDB:"$(<[1]:S=.pdb)" /out:"$(<[1])" /LIBPATH:$(LIBPATH) /LIBPATH:$(STDLIBPATH) "$(NEEDLIBS)" "$(FINDLIBS)" $(COMMAND)"$(>)"
+    $(MSVC_TOOL_PATH)link /nologo $(LINKFLAGS) /PDB:"$(<[1]:S=.pdb)" /out:"$(<[1])" /LIBPATH:$(LIBPATH) /LIBPATH:$(STDLIBPATH) "$(FINDLIBS)" @"$(>)"
 }
 
 #### Cc #####
diff --git a/v1/intel-win32-tools.jam b/v1/intel-win32-tools.jam
index 3fd76f8fd..80783aec1 100644
--- a/v1/intel-win32-tools.jam
+++ b/v1/intel-win32-tools.jam
@@ -22,19 +22,12 @@ extends-toolset msvc ;
 
 rule Link-action
 {
-    local command-file = $(<[1]:S=.CMD) ;
-    LOCATE on $(command-file) = $(gLOCATE($(<))) ;
-    COMMAND on $(<) = @ ;
-    intel-win32-Link-action $(<) : $(command-file) ;
-
-    list-files $(command-file) : $(>) ;
-    DEPENDS $(<) : $(command-file) ;
-    RmTemps $(<[1]) : $(command-file) ;
+    with-command-file intel-win32-Link-action $(<) : $(>) $(NEEDLIBS) ;
 }
 
 actions intel-win32-Link-action bind NEEDLIBS 
 {
-    $(INTEL_TOOL_PATH)xilink /nologo $(LINKFLAGS) /PDB:"$(<[1]:S=.pdb)" /out:"$(<[1])" $(UNDEFS) /LIBPATH:$(LIBPATH) /LIBPATH:$(STDLIBPATH) "$(NEEDLIBS)" "$(FINDLIBS)" $(COMMAND)"$(>)"
+    $(INTEL_TOOL_PATH)xilink /nologo $(LINKFLAGS) /PDB:"$(<[1]:S=.pdb)" /out:"$(<[1])" $(UNDEFS) /LIBPATH:$(LIBPATH) /LIBPATH:$(STDLIBPATH) "$(FINDLIBS)" @"$(>)"
 }
 
 #### Cc #####
diff --git a/v1/msvc-tools.jam b/v1/msvc-tools.jam
index 40d083293..d35bde2f5 100644
--- a/v1/msvc-tools.jam
+++ b/v1/msvc-tools.jam
@@ -55,19 +55,12 @@ flags msvc LINKFLAGS <target-type>DLL : /DLL ;
 
 rule Link-action
 {
-    local command-file = $(<[1]:S=.CMD) ;
-    LOCATE on $(command-file) = $(gLOCATE($(<))) ;
-    COMMAND on $(<) = @ ;
-    msvc-Link-action $(<) : $(command-file) ;
-
-    list-files $(command-file) : $(>) ;
-    DEPENDS $(<) : $(command-file) ;
-    RmTemps $(<[1]) : $(command-file) ;
+    with-command-file msvc-Link-action $(<) : $(>) $(NEEDLIBS) ;
 }
 
 actions together msvc-Link-action bind NEEDLIBS
 {
-    $(MSVC_TOOL_PATH)link /nologo $(LINKFLAGS) /PDB:"$(<[1]:S=.pdb)" /out:"$(<[1])" /LIBPATH:$(LIBPATH) /LIBPATH:$(STDLIBPATH) "$(NEEDLIBS)" "$(FINDLIBS)" $(COMMAND)"$(>)"
+    $(MSVC_TOOL_PATH)link /nologo $(LINKFLAGS) /PDB:"$(<[1]:S=.pdb)" /out:"$(<[1])" /LIBPATH:$(LIBPATH) /LIBPATH:$(STDLIBPATH) "$(FINDLIBS)" @"$(>)"
 }
 
 #### Cc #####