diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 41581f6f28..731b570f73 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,10 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-03-05 14:00 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/config/os2/install.cf
+    * workaround for command line size limitation borrowed from xHarbour
+
 2007-03-05 04:10 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbexpra.c
     ! fixed GPF when _GET_() parameter is passed in parenthesis
diff --git a/harbour/config/os2/install.cf b/harbour/config/os2/install.cf
index 19120488ba..e58baa4305 100644
--- a/harbour/config/os2/install.cf
+++ b/harbour/config/os2/install.cf
@@ -4,10 +4,15 @@
 
 ifeq ($(SHLVL),) # An OS/2 command shell
 
+define inst_file
+ECHO $(CP) $(file) $(INSTALL_OS2_DIR) >> _NSTALL.CMD
+
+endef
+
 INSTALL_LIST = $(subst /,\,$(INSTALL_OBJS))
-OS2_INSTALL_DIR = $(subst /,\,$(INSTALL_DIR))
-INSTALL_RULE =\
-	CMD.EXE /c FOR %f IN ($(INSTALL_LIST)) DO IF EXIST $(OS2_INSTALL_DIR). COPY %f $(OS2_INSTALL_DIR)
+INSTALL_OS2_DIR = $(subst /,\,$(INSTALL_DIR))
+INSTALL_RULE = $(foreach file, $(INSTALL_LIST), $(inst_file)) \
+	$(COMSPEC) /c _NSTALL.CMD & $(RM) _NSTALL.CMD
 
 else  # bash