diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f444fe1018..9006bcd89d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-14 02:49 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed to force empty extension for target executables
+      when creating Linux targets on non-Linux hosts using watcom.
+      (otherwise watcom defaults to '.elf')
+    ! Fixed upx command line to force compression (using --force-execve
+      option) for Linux targets created on non-Linux hosts using watcom.
+      Maybe it's always needed for watcom-built Linux targets, it
+      would be nice if someone could try.
+
 2009-07-14 01:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/darwin/gcc.cf
   * config/hpux/gcc.cf
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 261c2e71df..7fe198f28d 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -2631,6 +2631,8 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
          #else
             /* NOTE: This extension is used when building Linux targets on non-Linux hosts. [vszakats] */
             cObjExt := ".obj"
+            /* NOTE: Hack to force no extension for binaries. Otherwise they become '.elf'. [vszakats] */
+            cBinExt := "."
          #endif
          cLibPathPrefix := "LIBPATH "
          cLibPathSep := " "
@@ -2680,7 +2682,6 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
             AAdd( hbmk[ _HBMK_aOPTL ], "OP MAP" )
          ENDIF
 
-      /* Misc */
       CASE hbmk[ _HBMK_cARCH ] == "win" .AND. hbmk[ _HBMK_cCOMP ] == "bcc"
          IF hbmk[ _HBMK_lDEBUG ]
             AAdd( hbmk[ _HBMK_aOPTC ], "-y -v" )
@@ -4108,6 +4109,12 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
             cOpt_Cprs := "{OB}"
             cOpt_CprsMin := "-1"
             cOpt_CprsMax := "-9"
+            IF hbmk[ _HBMK_cARCH ] == "linux"
+               /* To avoid error below when creating Linux targets on non-Linux hosts using watcom:
+                  upx: t.: CantPackException: invalid Phdr p_offset; try '--force-execve'
+                  [vszakats] */
+               cOpt_Cprs += " --force-execve"
+            ENDIF
 
          #else