diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4fdb293fb8..b78fc67da6 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,17 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-01 16:05 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * config/win/bcc32.cf
+    ! Fixed to use response files with tlib, to avoid command line
+      length limits on some systems.
+
+  - tests/run_prg.bat
+  + tests/run.bat
+  - tests/run_prg_all.bat
+  + tests/run_all.bat
+    * Renamed to short name.
+
 2009-03-01 15:27 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   - contrib/hbct/ctflist.txt
   - contrib/hbodbc/odbc.txt
diff --git a/harbour/config/win/bcc32.cf b/harbour/config/win/bcc32.cf
index f853b5fd00..3c9b17fa80 100644
--- a/harbour/config/win/bcc32.cf
+++ b/harbour/config/win/bcc32.cf
@@ -68,9 +68,21 @@ endif
 
 LDFLAGS = $(LINKPATHS)
 
+#Note: The empty line below HAVE TO exist!
+define lib_object
+echo -+ $(subst /,\,$(LIB_DIR)/$(file)) ^& >> __lib__.tmp
+
+endef
+
+define create_library
+echo $(subst /,\,$(LIB_DIR)/$@) > __lib__.tmp
+$(foreach file, $(^F), $(lib_object))
+$(AR) $(ARFLAGS) @__lib__.tmp
+endef
+
 AR = tlib.exe
 ARFLAGS = $(HB_USER_AFLAGS)
 AROBJS = $(foreach file, $(^F), -+$(file))
-AR_RULE = $(AR) $(ARFLAGS) "$(subst /,\,$(LIB_DIR)/$@)" $(AROBJS),,
+AR_RULE = $(create_library)
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/tests/run_prg.bat b/harbour/tests/run.bat
similarity index 100%
rename from harbour/tests/run_prg.bat
rename to harbour/tests/run.bat
diff --git a/harbour/tests/run_prg_all.bat b/harbour/tests/run_all.bat
similarity index 100%
rename from harbour/tests/run_prg_all.bat
rename to harbour/tests/run_all.bat