diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 55af059909..fa98a96381 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+
+2009-08-15 23:255 UTC+0200 Maurilio Longo (maurilio.longo@libero.it)
+   * config/instsh.cf
+     ! fixed OS/2 section, work around for OS/2 shell max line lenght.
+
+
 2009-08-15 18:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/global.cf
     + Added new plans for further setting cleanup.
diff --git a/harbour/config/instsh.cf b/harbour/config/instsh.cf
index 617fb99d15..f49a7a9244 100644
--- a/harbour/config/instsh.cf
+++ b/harbour/config/instsh.cf
@@ -49,18 +49,20 @@ ifeq ($(HB_SHELL),nt)
 
 endif
 
-ifeq ($(HB_SHELL),os2)
 
-   define inst_file_all
-      -@if not exist $(INSTALL_DIR_OS) $(MDP) $(INSTALL_DIR)
-      $(foreach file,$(INSTALL_FILES_OS),$(inst_file))
-   endef
+ifeq ($(HB_SHELL),os2)
 
    # We have to use script to overcome the max command size limit
    # NOTE: The empty line directly before 'endef' HAVE TO exist!
-   #       It causes that every command will be separated by LF
+   # It causes that every commands will be separated by LF
+
+   # 05/Aug/2009 - <maurilio.longo@libero.it>
+   #               I don't like doing the "if not exist..." test for every file copied
+   #               but I could not find any other way to make this work around the shell
+   #               command line length limit.
    define inst_file
-      -@$(CP) $(file) $(INSTALL_DIR_OS)
+      @$(COMSPEC) /C if not exist $(INSTALL_DIR_OS) $(MDP) $(INSTALL_DIR)
+      $(COMSPEC) /C $(CP) $(file) $(INSTALL_DIR_OS)
 
    endef
 
@@ -68,6 +70,7 @@ ifeq ($(HB_SHELL),os2)
 
 endif
 
+
 ifeq ($(HB_SHELL),dos)
 
    define inst_file_all