diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index cabb52465d..760d2c0028 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,20 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-12 09:43 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/global.cf
+    ! Fixed to not indent one define/endef block.
+      I've actually even warned for this in comment, but ignored
+      it by mistake yesterday, and broke compiler autodetection.
+
+  * config/instsh.cf
+    % Deleted $(CMDPREF) from OS/2 rules. Please test it and report
+      if it broke.
+
+  * config/os2/watcom.cf
+  * config/os2/gcc.cf
+    + Added '@' prefix for echo cmds.
+
 2009-08-12 00:15 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/contrib/xhb/xcstr.prg
     % fixed fatal for performance code used to serialize hash arrays
diff --git a/harbour/config/global.cf b/harbour/config/global.cf
index 993aab8971..67e24fdbf3 100644
--- a/harbour/config/global.cf
+++ b/harbour/config/global.cf
@@ -40,7 +40,7 @@ MAKE_381 := $(filter $(need),$(firstword $(sort $(MAKE_VERSION) $(need))))
 
 # Don't indent this subroutine
 define find_in_path
-   $(strip $(foreach dir,$(subst $(PTHSEP), ,$(PATH)),$(wildcard $(dir)/$(1)$(HB_HOST_BIN_EXT))))
+$(strip $(foreach dir,$(subst $(PTHSEP), ,$(PATH)),$(wildcard $(dir)/$(1)$(HB_HOST_BIN_EXT))))
 endef
 
 define check_host
diff --git a/harbour/config/instsh.cf b/harbour/config/instsh.cf
index ae96b1f310..cd8c586a25 100644
--- a/harbour/config/instsh.cf
+++ b/harbour/config/instsh.cf
@@ -52,7 +52,7 @@ endif
 ifeq ($(HB_SHELL),os2)
 
    define inst_file_all
-      @$(CMDPREF)if not exist $(INSTALL_DIR_OS) $(MDP) $(INSTALL_DIR)
+      @if not exist $(INSTALL_DIR_OS) $(MDP) $(INSTALL_DIR)
       $(foreach file,$(INSTALL_FILES_OS),$(inst_file))
    endef
 
@@ -60,7 +60,7 @@ ifeq ($(HB_SHELL),os2)
    # NOTE: The empty line directly before 'endef' HAVE TO exist!
    #       It causes that every command will be separated by LF
    define inst_file
-      $(CMDPREF)$(CP) $(file) $(INSTALL_DIR_OS)
+      $(CP) $(file) $(INSTALL_DIR_OS)
 
    endef
 
diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf
index b4d36a822c..2551c41a75 100644
--- a/harbour/config/os2/gcc.cf
+++ b/harbour/config/os2/gcc.cf
@@ -73,7 +73,7 @@ endif
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 #       It causes that every command will be separated by LF
 #define lib_object
-#   echo ADDMOD $(file) >> __lib__.tmp
+#   @echo ADDMOD $(file) >> __lib__.tmp
 #
 #endef
 
@@ -81,10 +81,10 @@ endif
 # in commmand line
 define create_library
    if exist $(subst /,$(DIRSEP),$(LIB_FILE)) $(RM) $(subst /,$(DIRSEP),$(LIB_FILE))
-   echo CREATE $(LIB_DIR)/$@ > __lib__.tmp
+   @echo CREATE $(LIB_DIR)/$@ > __lib__.tmp
    for %i in ( *$(OBJ_EXT) ) do @echo ADDMOD %i >> __lib__.tmp
-   echo SAVE >> __lib__.tmp
-   echo END >> __lib__.tmp
+   @echo SAVE >> __lib__.tmp
+   @echo END >> __lib__.tmp
    $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -M < __lib__.tmp
 endef
 
diff --git a/harbour/config/os2/watcom.cf b/harbour/config/os2/watcom.cf
index 31b1d1ca2a..37693504f0 100644
--- a/harbour/config/os2/watcom.cf
+++ b/harbour/config/os2/watcom.cf
@@ -96,7 +96,7 @@ else
    endif
 
    define create_library
-      echo $(LIB_DIR)/$@ > __lib__.tmp
+      @echo $(LIB_DIR)/$@ > __lib__.tmp
       for $(FILE) in ( *$(OBJ_EXT) ) do @echo -+$(FILE) >> __lib__.tmp
       $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) @__lib__.tmp
    endef