diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 82a9896e8f..479dd09ec2 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,23 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-16 15:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/instsh.cf
+  * config/globsh.cf
+    ! Fixed to use plain copy command in DOS. Previous xcopy solution
+      returned with the dumb 'is it a file or dir?' message.
+      'copy' seems to overwrite existing target so no need to mess with
+      /Y switch, but it may be that I'm overlooking something.
+    * OS/2 $(CP) command changed to contain CMDPREF. This causes a little
+      change in .c to .yyc rule, at the same time it syncs this shell with
+      others. I hope it's harmless.
+    ; TOFIX: install dir creation doesn't work for dos shells.
+             Anyone knows a trick to create a multilevel dir in plain DOS? (aka mkdir -p)
+    ; TOFIX: dos/watcom does this: (should we force native harbour compiler?)
+             ../../../../../bin/dos/watcom/harbour.exe ../../../achoice.prg -n1  -gc3  -undef:__PLATFORM__WINDOWS -D__PLATFORM__DOS
+             run-time error R6009
+             - not enough space for environment
+
 2009-07-16 15:20 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/pp/ppcore.c
   * harbour/source/compiler/complex.c
@@ -282,7 +299,7 @@
   * config/os2/global.cf
   * config/wce/global.cf
     + COMSPEC detection centralized. Added command.com defaulting in DOS shells.
-    * Some 'MK:=' changed to 'MK='. (maybe ':=' is the correct one, I just
+    * Some 'MK:=' changed to 'MK='. (maybe ':=' is the correct one, I'm just
       syncing yet)
     + Added IA64 detection.
     + Not giving warning on missing HB_BIN_COMPILE on some host-target
@@ -458,7 +475,7 @@
       Currently 3.81 GNU Make is required (for the screen messages).
     + Moved DIRSEP init here.
     + Moved CMDPREF init here.
-    + Moved CompSpec detection here.
+    + Moved ComSpec detection here.
 
   * config/none.cf
     % Using global.cf for some central logic.
@@ -554,7 +571,7 @@
     ! Reverted prev cleanup.
     ; TOFIX: install rule for hbpp lib doesn't work after recent
              change. [REVERTED]
-    ; TODO: Delete HB_PPGEN_PATH.
+    ; TODO: Delete HB_PPGEN_PATH. [DONE]
 
 2009-07-15 12:39 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/lib.cf
@@ -1193,7 +1210,7 @@
       Windows and OS/2 hosts.
     ; TODO: Whole install/global/dir.cf logic is just crying to be moved
             to central location and be branched by host platform/shell
-            rather than target platform.
+            rather than target platform. [DONE]
     ; Please check me on the linux changes, could be that I messed it up.
 
   * source/rtl/Makefile
@@ -1211,7 +1228,7 @@
     + Added GPM autodetection.
     + Enabled gttrm for cygwin. (only in local make file)
     ; TOFIX: Remove such detection logic from make_gnu.sh (it's
-             now redundant and doesn't work for djgpp/cygwin)
+             now redundant and doesn't work for djgpp/cygwin) [DONE]
 
   * source/rtl/gtwin/gtwin.c
   * source/rtl/hbgtcore.c
diff --git a/harbour/config/globsh.cf b/harbour/config/globsh.cf
index 901b497b26..2b127cdc95 100644
--- a/harbour/config/globsh.cf
+++ b/harbour/config/globsh.cf
@@ -65,7 +65,7 @@ else ifeq ($(HB_SHELL),os2)
 MK = $(subst /,\,$(subst \~,~,$(MAKE)))
 RM = del /n
 RD = rmdir
-CP = copy
+CP = $(CMDPREF)copy
 MV = move
 MD = mkdir
 
diff --git a/harbour/config/instsh.cf b/harbour/config/instsh.cf
index 2fa0986f11..e81165fa58 100644
--- a/harbour/config/instsh.cf
+++ b/harbour/config/instsh.cf
@@ -61,7 +61,7 @@ endef
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 # It causes that every commands will be separated by LF
 define inst_file
-$(CMDPREF)$(CP) $(file) $(INSTALL_DIR_OS)
+$(CP) $(file) $(INSTALL_DIR_OS)
 
 endef
 
@@ -80,7 +80,7 @@ endef
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 # It causes that every commands will be separated by LF
 define inst_file
-$(CMDPREF)xcopy /Y /I $(file) $(INSTALL_DIR_OS)
+$(CP) $(file) $(INSTALL_DIR_OS)
 
 endef