diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b99d0b4a40..d850fa9a6a 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-10-20 11:37 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/config/win/xcc.mk
+    + added small hack enabled for sh only to resolve two problems with
+      harbour.dll in XCC builds: the import library was created in bin
+      directory and it was using .LIB extension instead of .lib so it
+      was not working with case sensitive FS
+
 2009-10-20 01:20 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     + Added option to control C compiler warning level:
diff --git a/harbour/config/win/xcc.mk b/harbour/config/win/xcc.mk
index 04d5040e0c..56bdbf161a 100644
--- a/harbour/config/win/xcc.mk
+++ b/harbour/config/win/xcc.mk
@@ -59,6 +59,12 @@ DFLAGS := -nologo -dll $(LIBPATHS)
 DY_OUT := $(LD_OUT)
 DLIBS := $(foreach lib,$(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
 
+ifeq ($(HB_SHELL),sh)
+   DYNFIX = && mv $(DYN_DIR)/$(@:.dll=.LIB) $(LIB_DIR)/$(@:.dll=.lib) && $(RM) $(DYN_DIR)/$(@:.dll=.EXP)
+else
+   DYNFIX :=
+endif
+
 # NOTE: The empty line directly before 'endef' HAVE TO exist!
 define dyn_object
    @$(ECHO) $(ECHOQUOTE)$(subst /,\,$(file))$(ECHOQUOTE) >> __dyn__.tmp
@@ -67,7 +73,7 @@ endef
 define create_dynlib
    $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,)
    $(foreach file,$^,$(dyn_object))
-   $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)"$(subst /,\,$(DYN_DIR)/$@)" @__dyn__.tmp $(DLIBS)
+   $(DY) $(DFLAGS) $(HB_USER_DFLAGS) $(DY_OUT)"$(subst /,\,$(DYN_DIR)/$@)" @__dyn__.tmp $(DLIBS) $(DYNFIX)
 endef
 
 DY_RULE = $(create_dynlib)