diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 018a0ea1e0..3101c09138 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,18 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-09-13 20:36 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/config/win/watcom.mk
+    * removed .exe suffix from executed tools.
+      It fixes cross builds using native Linux binaries.
+      If someone wants to make some tests using windows binaries executed
+      by WINE then please make the following soft links:
+         wpp386 -> wpp386.exe
+         wcc386 -> wcc386.exe
+         wlink -> wlink.exe
+         wrc -> wrc.exe
+      or script wrappers
+
 2010-09-13 17:00 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/contrib/hbwin/hbwinole.h
   * harbour/contrib/hbwin/axcore.c
diff --git a/harbour/config/win/watcom.mk b/harbour/config/win/watcom.mk
index aff001de94..250f0b9136 100644
--- a/harbour/config/win/watcom.mk
+++ b/harbour/config/win/watcom.mk
@@ -11,9 +11,9 @@ LIB_EXT := .lib
 HB_DYN_COPT := -DHB_DYNLIB
 
 ifeq ($(HB_BUILD_MODE),cpp)
-   CC := wpp386.exe
+   CC := wpp386
 else
-   CC := wcc386.exe
+   CC := wcc386
 endif
 CC_IN :=
 CC_OUT := -fo=
@@ -36,7 +36,7 @@ ifneq ($(HB_BUILD_OPTIM),no)
    # -oxaht
    CFLAGS += -onaehtr -s -ei -zp4 -zt0
    #CFLAGS += -obl+m
-   ifeq ($(CC),wpp386.exe)
+   ifeq ($(CC),wpp386)
       CFLAGS += -oi+
    else
       CFLAGS += -oi
@@ -51,11 +51,11 @@ ifeq ($(HB_BUILD_DEBUG),yes)
    CFLAGS += -d2
 endif
 
-RC := wrc.exe
+RC := wrc
 RC_OUT := -fo=
 RCFLAGS += -q -r -zm -bt=nt
 
-LD := wlink.exe
+LD := wlink
 ifeq ($(HB_BUILD_DEBUG),yes)
    LDFLAGS += DEBUG ALL
 endif