diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b6b365c7ee..718096c8dc 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,18 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-18 21:20 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  + harbour/config/dj-echo.exe
+    + added DJGPP echo.exe
+
+  * harbour/config/dirsh.mk
+  * harbour/config/none.mk
+  * harbour/config/global.mk
+  * harbour/config/globsh.mk
+  * harbour/config/instsh.mk
+    * use '$(ECHO)' instead of 'echo'
+    * replaced all COMMAND.COM commands by DJGPP tools
+
 2009-08-18 19:44 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/contrib/hbodbc/odbc.c
   * harbour/contrib/rddsql/sddodbc/odbcdd.c
diff --git a/harbour/config/dirsh.mk b/harbour/config/dirsh.mk
index 6f9dea9a66..6200753bde 100644
--- a/harbour/config/dirsh.mk
+++ b/harbour/config/dirsh.mk
@@ -8,7 +8,7 @@ ifneq ($(HB_SHELL),sh)
 endif
 
 ifeq ($(DIRS),) # Empty directory list
-   DIR_RULE := @echo $(ECHOQUOTE)! Done$(ECHOQUOTE)
+   DIR_RULE := @$(ECHO) $(ECHOQUOTE)! Done$(ECHOQUOTE)
 else
 
 ifeq ($(HB_SHELL),sh)
diff --git a/harbour/config/dj-echo.exe b/harbour/config/dj-echo.exe
new file mode 100644
index 0000000000..5722321a47
Binary files /dev/null and b/harbour/config/dj-echo.exe differ
diff --git a/harbour/config/global.mk b/harbour/config/global.mk
index 4f9a05e0a7..052bd34d89 100644
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -39,7 +39,7 @@ ok := $(filter $(need),$(firstword $(sort $(MAKE_VERSION) $(need))))
 
 ifeq ($(ok),)
 
-all: ; @echo "! Error: GNU Make version $(MAKE_VERSION) found, $(need) or upper needed for Harbour"
+all: ; @$(ECHO) "! Error: GNU Make version $(MAKE_VERSION) found, $(need) or upper needed for Harbour"
 
 else
 
diff --git a/harbour/config/globsh.mk b/harbour/config/globsh.mk
index ef53d0b0b4..46f1f32ae3 100644
--- a/harbour/config/globsh.mk
+++ b/harbour/config/globsh.mk
@@ -35,6 +35,7 @@ RDP := rm -f -r
 CP := cp -f
 MD := mkdir
 MDP := mkdir -p
+ECHO := echo
 
 dirbase::
 	@[ -d "$(OBJ_DIR)" ] || $(MDP) $(OBJ_DIR)
@@ -45,11 +46,11 @@ clean::
 	-@$(RDP) $(PKG_DIR) $(OBJ_DIR) $(LIB_FILE) $(BIN_FILE); \
 	if [ -n "$(LIB_FILE)" ]; then \
 	   $(RM) $(basename $(LIB_FILE)).bak; \
-	   [ "`echo $(LIB_DIR)/*`" != "$(LIB_DIR)/*" ] || $(RDP) $(LIB_DIR); \
+	   [ "`$(ECHO) $(LIB_DIR)/*`" != "$(LIB_DIR)/*" ] || $(RDP) $(LIB_DIR); \
 	fi ; \
 	if [ -n "$(BIN_FILE)" ]; then \
 	   $(RM) $(basename $(BIN_FILE)).tds; \
-	   [ "`echo $(BIN_DIR)/*`" != "$(BIN_DIR)/*" ] || $(RDP) $(BIN_DIR); \
+	   [ "`$(ECHO) $(BIN_DIR)/*`" != "$(BIN_DIR)/*" ] || $(RDP) $(BIN_DIR); \
 	fi
 
 endif
@@ -67,6 +68,7 @@ RDP := rmdir /q /s
 CP := copy
 MD := mkdir
 MDP := mkdir
+ECHO := echo
 
 dirbase::
 	-@if not exist "$(OBJ_DIR_OS)" $(MDP) "$(OBJ_DIR_OS)"
@@ -93,6 +95,7 @@ RDP := $(TOOL_DIR)os2-rm -rf
 CP := copy
 MD := mkdir
 MDP := $(TOOL_DIR)os2-mkdir -p
+ECHO := echo
 
 dirbase::
 	-@if not exist $(OBJ_DIR_OS) $(MDP) $(OBJ_DIR)
@@ -109,11 +112,12 @@ endif
 ifeq ($(HB_SHELL),dos)
 
 MK := $(subst \,/,$(MAKE))
-RM := del
+RM := $(TOOL_DIR)dj-rm -f
 RDP := $(TOOL_DIR)dj-rm -fr
 CP := $(TOOL_DIR)dj-cp -f
-MD := mkdir
+MD := $(TOOL_DIR)dj-mkdir
 MDP := $(TOOL_DIR)dj-mkdir -p
+ECHO := $(TOOL_DIR)dj-echo
 
 dirbase::
 	-@$(MDP) $(OBJ_DIR_OS)
@@ -122,9 +126,9 @@ dirbase::
 
 clean::
 	-@$(RDP) $(PKG_DIR_OS) $(OBJ_DIR_OS) $(LIB_FILE_OS) $(BIN_FILE_OS)
-	$(if $(LIB_FILE),-@$(RDP) $(basename $(LIB_FILE_OS)).bak,)
+	$(if $(LIB_FILE),-@$(RM) $(basename $(LIB_FILE_OS)).bak,)
 	$(if $(LIB_FILE),$(if $(wildcard $(LIB_DIR_OS)/*.*),,-@$(RDP) $(LIB_DIR_OS)),)
-	$(if $(BIN_FILE),-@$(RDP) $(basename $(BIN_FILE_OS)).tds ,)
+	$(if $(BIN_FILE),-@$(RM) $(basename $(BIN_FILE_OS)).tds ,)
 	$(if $(BIN_FILE),$(if $(wildcard $(BIN_DIR_OS)/*.*),,-@$(RDP) $(BIN_DIR_OS)),)
 
 endif
diff --git a/harbour/config/instsh.mk b/harbour/config/instsh.mk
index 22ea2dd662..3fdfb4b942 100644
--- a/harbour/config/instsh.mk
+++ b/harbour/config/instsh.mk
@@ -3,10 +3,10 @@
 #
 
 ifeq ($(INSTALL_FILES),) # Empty install list
-   INSTALL_RULE := @echo $(ECHOQUOTE)! Nothing to install$(ECHOQUOTE)
+   INSTALL_RULE := @$(ECHO) $(ECHOQUOTE)! Nothing to install$(ECHOQUOTE)
 else
 ifeq ($(INSTALL_DIR),) # Empty install dir
-   INSTALL_RULE := @echo $(ECHOQUOTE)! Can't install, install dir isn't set$(ECHOQUOTE)
+   INSTALL_RULE := @$(ECHO) $(ECHOQUOTE)! Can't install, install dir isn't set$(ECHOQUOTE)
 else
 
 ifneq ($(HB_SHELL),sh)
@@ -20,18 +20,18 @@ ifeq ($(HB_SHELL),sh)
       @$(MDP) $(subst \,/,$(INSTALL_DIR)); \
       if [ ! -d "$(subst \,/,$(INSTALL_DIR))" ]; \
       then \
-         echo "! Can't install, path not found: '$(subst \,/,$(INSTALL_DIR))'" 1>&2; \
+         $(ECHO) "! Can't install, path not found: '$(subst \,/,$(INSTALL_DIR))'" 1>&2; \
          false; \
       else \
          for i in $(INSTALL_FILES); \
          do \
             if [ -r "$$i" ]; \
             then \
-               echo "! Installing $$i on $(subst \,/,$(INSTALL_DIR))"; \
+               $(ECHO) "! Installing $$i on $(subst \,/,$(INSTALL_DIR))"; \
                $(CP) $$i $(subst \,/,$(INSTALL_DIR)); \
                true; \
             else \
-               echo "! Can't install $$i, not found" 1>&2; \
+               $(ECHO) "! Can't install $$i, not found" 1>&2; \
             fi \
          done \
       fi
diff --git a/harbour/config/none.mk b/harbour/config/none.mk
index a588c3fb6c..80476b614d 100644
--- a/harbour/config/none.mk
+++ b/harbour/config/none.mk
@@ -8,7 +8,7 @@ ifneq ($(HB_ARCHITECTURE),)
 ifneq ($(HB_COMPILER),)
 
 ifneq ($(LIBNAME),)
-   DIR_RULE := @echo $(ECHOQUOTE)! '$(LIBNAME)' library skipped$(ECHOQUOTE)
+   DIR_RULE := @$(ECHO) $(ECHOQUOTE)! '$(LIBNAME)' library skipped$(ECHOQUOTE)
 else
    DIR_RULE :=
 endif