diff --git a/ChangeLog b/ChangeLog
index f352d145..4ef04145 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-09-06  Peter Rosin  <peda@lysator.liu.se>
 
+	Convert file names to toolchain format when linking.
+	* libltdl/config/ltmain.m4sh (func_mode_link): When exporting
+	symbols and when linking using command files (or response
+	files), make sure that both the name of the command file and
+	the content are made up of file names in a format appropriate
+	for the tool. Fixes problems in stresstest.at on MSYS when run
+	with low command line length.
+
 	Add file name conversion from $build to toolchain.
 	* configure.ac: Ensure to_tool_file_cmd is available to Makefile.
 	* libltdl/m4/libtool.m4 (_LT_PATH_CONVERSION_FUNCTIONS): Add
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 2cccd47f..70f58a82 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -7486,10 +7486,13 @@ EOF
 	    echo 'INPUT (' > $output
 	    for obj in $save_libobjs
 	    do
-	      $ECHO "$obj" >> $output
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
 	    done
 	    echo ')' >> $output
 	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$func_to_tool_file_result
 	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
 	    output=${output_objdir}/${output_la}.lnk
 	    func_verbose "creating linker input file list: $output"
@@ -7503,10 +7506,12 @@ EOF
 	    fi
 	    for obj
 	    do
-	      $ECHO "$obj" >> $output
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
 	    done
 	    func_append delfiles " $output"
-	    output=$firstobj\"$file_list_spec$output\"
+	    func_to_tool_file "$output"
+	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
 	  else
 	    if test -n "$save_libobjs"; then
 	      func_verbose "creating reloadable object files..."