diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 722b9af912..b95d4297d2 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,13 +8,17 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-04-09 20:42 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk2/hbmk2.prg
+    - Disabled UPX support for all non-Linux *nix systems.
+
 2009-04-09 10:51 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * harbour/contrib/hbqt/hbqt_qwidget.cpp
   * harbour/contrib/hbqt/qth/QWidget.qth
   * harbour/contrib/hbqt/TQWidget.prg
     ! Commented out more non-portable functions belongings to
       Win Handles family.
-    
+
 2009-04-09 08:18 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * harbour/contrib/hbqt/hbqt.h
   * harbour/contrib/hbqt/hbqt_qfont.cpp
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 85f4f43552..35bbcc0bd8 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -509,10 +509,12 @@ PROCEDURE Main( ... )
       cDynLibNamePrefix := "lib"
       cBinExt := NIL
       cOptPrefix := "-"
-      cBin_Cprs := "upx"
-      cOpt_Cprs := "{OB}"
-      cOpt_CprsMin := "-1"
-      cOpt_CprsMax := "-9"
+      IF t_cARCH == "linux"
+         cBin_Cprs := "upx"
+         cOpt_Cprs := "{OB}"
+         cOpt_CprsMin := "-1"
+         cOpt_CprsMax := "-9"
+      ENDIF
       SWITCH t_cARCH
       CASE "darwin" ; cDynLibExt := ".dylib" ; EXIT
       CASE "hpux"   ; cDynLibExt := ".sl" ; EXIT
@@ -3719,7 +3721,7 @@ STATIC PROCEDURE ShowHelp( lLong )
       "  -l<libname>       link with <libname> library" ,;
       "  -L<libpath>       additional path to search for libraries" ,;
       "  -static|-shared   link with static/shared libs" ,;
-      "  -mt|-st           link with multi-thread/single-thread VM" ,;
+      "  -mt|-st           link with multi/single-thread VM" ,;
       "  -gt<name>         link with GT<name> GT driver, can be repeated to link" ,;
       "                    with more GTs. First one will be the default at runtime" }