diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 26cb6b4fb0..af3a98cc17 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,12 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-14 16:48 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/pp/Makefile
+    ! fixed hardcoded for windows shortcut (Change~1) ChangeLog name
+      in DOS OpenWatcom builds so now it's possible again to create
+      such builds in real DOS without LFN support
+
 2009-07-14 16:21 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * make_gnu.sh
     - Reverted most part of prev. It's still needed to form
diff --git a/harbour/source/pp/Makefile b/harbour/source/pp/Makefile
index 4afbb42809..a4e1cc26dd 100644
--- a/harbour/source/pp/Makefile
+++ b/harbour/source/pp/Makefile
@@ -27,13 +27,9 @@ INSTALL_RULE_LIBRARIES := $(INSTALL_RULE)
 HB_VERHEADER=$(TOP)$(ROOT)include/hbverbld.h
 
 ifeq ($(HB_CHANGELOG),)
-   ifeq ($(HB_ARCHITECTURE),dos)
-   ifeq ($(HB_COMPILER),watcom)
-   HB_CHANGELOG:=$(TOP)$(ROOT)change~1
+   ifneq ($(HB_ARCHITECTURE)/$(HB_COMPILER),dos/watcom)
+      HB_CHANGELOG:=$(wildcard $(TOP)$(ROOT)[Cc]hange[Ll]og)
    endif
-   endif
-ifeq ($(HB_CHANGELOG),)
-   HB_CHANGELOG:=$(wildcard $(TOP)$(ROOT)ChangeLog)
 ifeq ($(HB_CHANGELOG),)
    HB_CHANGELOG:=$(wildcard $(TOP)$(ROOT)[Cc]hange[Ll]o)
 ifeq ($(HB_CHANGELOG),)
@@ -42,6 +38,8 @@ ifeq ($(HB_CHANGELOG),)
    HB_CHANGELOG:=$(wildcard $(TOP)$(ROOT)[Cc]hange~?)
 ifeq ($(HB_CHANGELOG),)
    HB_CHANGELOG:=$(wildcard $(TOP)$(ROOT)[Cc]hang~??)
+ifeq ($(HB_CHANGELOG),)
+   HB_CHANGELOG:=$(wildcard $(TOP)$(ROOT)[Cc]hange[Ll]og)
 endif
 endif
 endif