diff --git a/mingw-tools.jam b/mingw-tools.jam
index 5a8b684c5..45daf19a6 100644
--- a/mingw-tools.jam
+++ b/mingw-tools.jam
@@ -31,6 +31,10 @@ rule Link-action
     # proved to be neccessary with some versions of Cygwin.
     IMPLIB_COMMAND on $(<) = "-Wl,--exclude-symbols,_bss_end__:_bss_start__:_data_end__:_data_start__ -Wl,--out-implib," ;
     mingw-Link-action $(<) : $(>) ;
+    # Workaround GCC's lack of command-files and NT's line-length limitation.
+    if $(NT) {
+        JAMSHELL on $(<) = % ;
+    }
 }
 
 # for mingw, we repeat all libraries so that dependencies are always resolved
diff --git a/v1/mingw-tools.jam b/v1/mingw-tools.jam
index 5a8b684c5..45daf19a6 100644
--- a/v1/mingw-tools.jam
+++ b/v1/mingw-tools.jam
@@ -31,6 +31,10 @@ rule Link-action
     # proved to be neccessary with some versions of Cygwin.
     IMPLIB_COMMAND on $(<) = "-Wl,--exclude-symbols,_bss_end__:_bss_start__:_data_end__:_data_start__ -Wl,--out-implib," ;
     mingw-Link-action $(<) : $(>) ;
+    # Workaround GCC's lack of command-files and NT's line-length limitation.
+    if $(NT) {
+        JAMSHELL on $(<) = % ;
+    }
 }
 
 # for mingw, we repeat all libraries so that dependencies are always resolved