diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 7b5e2272c9..5faa89a23e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,30 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-23 13:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/globsh.mk
+  * config/readme.txt
+  - config/dj-cp.exe
+  - config/dj-echo.exe
+  - config/dj-mkdir.exe
+  - config/dj-rm.exe
+  + config/doscp.exe
+  + config/dosecho.exe
+  + config/dosmkdir.exe
+  + config/dosrm.exe
+  - config/os2-cp.exe
+  - config/os2-echo.exe
+  - config/os2-mkdir.exe
+  - config/os2-rm.exe
+  + config/os2cp.exe
+  + config/os2echo.exe
+  + config/os2mkdir.exe
+  + config/os2rm.exe
+    * Renamed included GNU tools to avoid using any long filename.
+
+  - config/Makefile
+    - Deleted. No longer needed.
+
 2009-08-23 12:54 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * INSTALL
   + dos-make.exe
diff --git a/harbour/config/Makefile b/harbour/config/Makefile
deleted file mode 100644
index f8444a7569..0000000000
--- a/harbour/config/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# $Id$
-#
-
-all: ; $(error ! Error: GNU Make must be run from the Harbour root directory)
diff --git a/harbour/config/dj-cp.exe b/harbour/config/doscp.exe
similarity index 100%
rename from harbour/config/dj-cp.exe
rename to harbour/config/doscp.exe
diff --git a/harbour/config/dj-echo.exe b/harbour/config/dosecho.exe
similarity index 100%
rename from harbour/config/dj-echo.exe
rename to harbour/config/dosecho.exe
diff --git a/harbour/config/dj-mkdir.exe b/harbour/config/dosmkdir.exe
similarity index 100%
rename from harbour/config/dj-mkdir.exe
rename to harbour/config/dosmkdir.exe
diff --git a/harbour/config/dj-rm.exe b/harbour/config/dosrm.exe
similarity index 100%
rename from harbour/config/dj-rm.exe
rename to harbour/config/dosrm.exe
diff --git a/harbour/config/globsh.mk b/harbour/config/globsh.mk
index 500612f812..991531e20c 100644
--- a/harbour/config/globsh.mk
+++ b/harbour/config/globsh.mk
@@ -121,17 +121,17 @@ endif
 ifeq ($(HB_SHELL),os2)
 
 # NOTE: Comment on included OS/2 GNU tools:
-#       os2-mkdir and os2-cp expects forward slashes, while
-#       os2-rm expects backslashes in filenames. [vszakats]
+#       os2mkdir and os2cp expects forward slashes, while
+#       os2rm expects backslashes in filenames. [vszakats]
 
 MK := $(subst \,/,$(MAKE))
-RM := $(TOOL_DIR)os2-rm -f
-RDP := $(TOOL_DIR)os2-rm -fr
-CP := $(TOOL_DIR)os2-cp -f
+RM := $(TOOL_DIR)os2rm -f
+RDP := $(TOOL_DIR)os2rm -fr
+CP := $(TOOL_DIR)os2cp -f
 LN :=
-MD := $(TOOL_DIR)os2-mkdir
-MDP := $(TOOL_DIR)os2-mkdir -p
-ECHO := $(TOOL_DIR)os2-echo
+MD := $(TOOL_DIR)os2mkdir
+MDP := $(TOOL_DIR)os2mkdir -p
+ECHO := $(TOOL_DIR)os2echo
 ECHOQUOTE := "
 
 dirbase::
@@ -158,13 +158,13 @@ endif
 ifeq ($(HB_SHELL),dos)
 
 MK := $(subst \,/,$(MAKE))
-RM := $(TOOL_DIR)dj-rm -f
-RDP := $(TOOL_DIR)dj-rm -fr
-CP := $(TOOL_DIR)dj-cp -f
+RM := $(TOOL_DIR)dosrm -f
+RDP := $(TOOL_DIR)dosrm -fr
+CP := $(TOOL_DIR)doscp -f
 LN :=
-MD := $(TOOL_DIR)dj-mkdir
-MDP := $(TOOL_DIR)dj-mkdir -p
-ECHO := $(TOOL_DIR)dj-echo
+MD := $(TOOL_DIR)dosmkdir
+MDP := $(TOOL_DIR)dosmkdir -p
+ECHO := $(TOOL_DIR)dosecho
 ECHOQUOTE := "
 
 dirbase::
diff --git a/harbour/config/os2-cp.exe b/harbour/config/os2cp.exe
similarity index 100%
rename from harbour/config/os2-cp.exe
rename to harbour/config/os2cp.exe
diff --git a/harbour/config/os2-echo.exe b/harbour/config/os2echo.exe
similarity index 100%
rename from harbour/config/os2-echo.exe
rename to harbour/config/os2echo.exe
diff --git a/harbour/config/os2-mkdir.exe b/harbour/config/os2mkdir.exe
similarity index 100%
rename from harbour/config/os2-mkdir.exe
rename to harbour/config/os2mkdir.exe
diff --git a/harbour/config/os2-rm.exe b/harbour/config/os2rm.exe
similarity index 100%
rename from harbour/config/os2-rm.exe
rename to harbour/config/os2rm.exe
diff --git a/harbour/config/readme.txt b/harbour/config/readme.txt
index e46bcaa772..47109bf53c 100644
--- a/harbour/config/readme.txt
+++ b/harbour/config/readme.txt
@@ -31,13 +31,13 @@ Included utilities are:
      License:
         GPL 2 (see below)
      Links to included binaries + sources:
-        - DJGPP (dj-mkdir.exe, dj-rm.exe, dj-cp.exe, dj-echo.exe)
+        - DJGPP (dosmkdir.exe, dosrm.exe, doscp.exe, dosecho.exe)
              ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/
              ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/fil41b.zip
              ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/fil41s.zip
              ftp://ftp.delorie.com/pub/djgpp/current/v2/djdev203.zip
              ftp://ftp.delorie.com/pub/djgpp/current/v2/djlsr203.zip
-        - OS/2 (os2-mkdir.exe, os2-rm.exe, os2-cp.exe, os2-echo.exe)
+        - OS/2 (os2mkdir.exe, os2rm.exe, os2cp.exe, os2echo.exe)
              http://os2ports.smedley.info/index.php?page=build-environment
              http://download.smedley.info/buildenv_20071022.zip
              (couldn't find the sources here)