diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 66003fee43..519bd03d19 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,11 +17,22 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+
+2009-08-07 23:43 UTC+0200 Maurilio Longo (maurilio.longo@libero.it)
+   * config/globsh.cf
+     ! fixed OS/2 section, os2-mkdir needs forward slashes as directory
+       separators, not backslashes.
+   * config/instsh.cf
+     ! fixed OS/2 section, work around for OS/2 shell max line lenght.
+   * config/os2/global.cf
+     * EXE_EXT set to .exe
+
+
 2009-08-07 12:35 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbxbp/appevent.ch
   * contrib/hbxbp/xbpbrowse.prg
-    ! A thorough rewrite of XbpBrowse() class. The vertical navigation is 
-      based on TBrowse() class and hence XbpBrowse() via Qt will probably be the 
+    ! A thorough rewrite of XbpBrowse() class. The vertical navigation is
+      based on TBrowse() class and hence XbpBrowse() via Qt will probably be the
       fastest GUI browser in the market in the sense that it has almost negligible
       memory overhead.
 
@@ -29,18 +40,18 @@
     ! Fine-tuned XbpBrowse() code confirming to latest changes.
 
     /*
-       Finally I could achieve vertical navigation as per TBrowse without any 
-       memory overhead. Horizontal navigation stll needs a lot of work but in its 
-       simplest form it is working. Please play with vertical navigation and report 
+       Finally I could achieve vertical navigation as per TBrowse without any
+       memory overhead. Horizontal navigation stll needs a lot of work but in its
+       simplest form it is working. Please play with vertical navigation and report
        on this list any differences you might found.
 
-       XbpBrowse() truely follows Xbase++ event loop protocol. So it is possible 
+       XbpBrowse() truely follows Xbase++ event loop protocol. So it is possible
        that you can try real-life XbpBrowse code with Harbour-Qt. I am looking forward
-       your support in this direction. Because it is taking my lot of time to 
-       understand the Qt's internal behavior of model/view programming, I am 
+       your support in this direction. Because it is taking my lot of time to
+       understand the Qt's internal behavior of model/view programming, I am
        finding it hard to test all possible scenarios.
 
-       Please make experiments with array bowsers, indexed browsers, etc. and provide 
+       Please make experiments with array bowsers, indexed browsers, etc. and provide
        feedback as much as possible.
 
        Enjoy
diff --git a/harbour/config/globsh.cf b/harbour/config/globsh.cf
index aed43c9fd1..0342e70a10 100644
--- a/harbour/config/globsh.cf
+++ b/harbour/config/globsh.cf
@@ -74,22 +74,22 @@ endif
 
 ifeq ($(HB_SHELL),os2)
 
-MK = $(subst /,\,$(subst \~,~,$(MAKE)))
+MK = $(subst \,/,$(subst \~,~,$(MAKE)))
 RM = del /n
-RD = $(TOOL_DIR)os2-rm -f -r
+RDP = $(TOOL_DIR)os2-rm -rf
 CP = copy
 MD = mkdir
 MDP = $(TOOL_DIR)os2-mkdir -p
 
 dirbase::
-	-@if not exist $(OBJ_DIR_OS) $(MDP) $(OBJ_DIR_OS)
-	$(if $(LIB_FILE),-@if not exist $(LIB_DIR_OS) $(MDP) $(LIB_DIR_OS),)
-	$(if $(BIN_FILE),-@if not exist $(BIN_DIR_OS) $(MDP) $(BIN_DIR_OS),)
+	-@if not exist $(OBJ_DIR_OS) $(MDP) $(OBJ_DIR)
+	$(if $(LIB_FILE),-@if not exist $(LIB_DIR_OS) $(MDP) $(LIB_DIR),)
+	$(if $(BIN_FILE),-@if not exist $(BIN_DIR_OS) $(MDP) $(BIN_DIR),)
 
 clean::
-	-@$(RDP) $(OBJ_DIR_OS) $(LIB_FILE_OS) $(BIN_FILE_OS)
-	$(if $(LIB_FILE),-@if not exist $(LIB_DIR_OS) $(RDP) $(LIB_DIR_OS),)
-	$(if $(BIN_FILE),-@if not exist $(BIN_DIR_OS) $(RDP) $(BIN_DIR_OS),)
+	@$(RDP) $(OBJ_DIR_OS) $(LIB_FILE_OS) $(BIN_FILE_OS)
+	$(if $(LIB_FILE),-@if exist $(LIB_DIR_OS) $(RDP) $(LIB_DIR_OS),)
+	$(if $(BIN_FILE),-@if exist $(BIN_DIR_OS) $(RDP) $(BIN_DIR_OS),)
 
 endif
 
diff --git a/harbour/config/instsh.cf b/harbour/config/instsh.cf
index 1034fefe3a..f2e017bee9 100644
--- a/harbour/config/instsh.cf
+++ b/harbour/config/instsh.cf
@@ -57,22 +57,21 @@ endif
 
 ifeq ($(HB_SHELL),os2)
 
-define inst_file_all
-if not exist $(INSTALL_DIR_OS) $(MDP) $(INSTALL_DIR_OS)
-$(foreach file, $(INSTALL_FILES_OS), $(inst_file))
-
-endef
-
 # 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 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
 
-INSTALL_RULE =\
-	$(inst_file_all)
+INSTALL_RULE = $(foreach file, $(INSTALL_FILES_OS), $(inst_file))
 
 endif
 
diff --git a/harbour/config/os2/global.cf b/harbour/config/os2/global.cf
index d4cd1a8415..811340ab4f 100644
--- a/harbour/config/os2/global.cf
+++ b/harbour/config/os2/global.cf
@@ -4,6 +4,7 @@
 
 all : first
 
-BIN_EXT :=
+BIN_EXT := .exe
 
 HB_GT_LIBS += gtos2
+