diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c0a3d3d5f3..a9fb2510f2 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,13 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-02-07 11:24 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/config/os2/gcc.cf
+    * use OS2_LIB_ARCH as library name to avoid problems with DEL
+  * harbour/config/os2/global.cf
+    * use double backslash characters - hack to test if it's sufficient
+      workaround for problems mkdir on OS2
+
 2008-02-06 11:08 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
   * harbour/common.mak
   * harbour/make_gcc.mak
diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf
index cd41aecbe4..2210c86e81 100644
--- a/harbour/config/os2/gcc.cf
+++ b/harbour/config/os2/gcc.cf
@@ -86,7 +86,7 @@ endef
 # We have to use a script to overcome the AR limit of max 850 characters
 # in commmand line
 define create_library
-IF EXIST $(LIB_DIR)/$@ $(RM) $(LIB_DIR)/$@
+IF EXIST $(OS2_LIB_ARCH) $(RM) $(OS2_LIB_ARCH)
 echo CREATE $(LIB_DIR)/$@ > __lib__.tmp
 $(foreach file, $(^F), $(lib_object))
 echo SAVE >> __lib__.tmp
diff --git a/harbour/config/os2/global.cf b/harbour/config/os2/global.cf
index fa3a61af51..0ccfcd3fc9 100644
--- a/harbour/config/os2/global.cf
+++ b/harbour/config/os2/global.cf
@@ -22,10 +22,10 @@ endif
 ifeq ($(SHLVL),) # An OS/2 command shell
 
 ARCH_DIR = $(HB_ARCH)
-OS2_ARCH_DIR = $(subst /,\,$(HB_ARCH))
-OS2_LIB_DIR = $(subst /,\,$(LIB_DIR))
-OS2_LIB_PATH = $(subst /,\,$(LIB_PATH))
-OS2_LIB_ARCH = $(subst /,\,$(LIB_ARCH))
+OS2_ARCH_DIR = $(subst /,\\,$(HB_ARCH))
+OS2_LIB_DIR  = $(subst /,\\,$(LIB_DIR))
+OS2_LIB_PATH = $(subst /,\\,$(LIB_PATH))
+OS2_LIB_ARCH = $(subst /,\\,$(LIB_ARCH))
 DIRSEP = $(subst /,\,\)
 
 MK = $(subst /,\,$(subst \~,~,$(MAKE)))
@@ -73,6 +73,8 @@ MV = mv -f
 MD = mkdir
 MDP = mkdir -p
 
+OS2_LIB_ARCH = $(LIB_ARCH)
+
 dirbase::
 	@[ -d $(ARCH_DIR) ] || $(MDP) $(ARCH_DIR)
 	@[ -z $(LIB_DIR) ] || [ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR)