diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 12c245d76b..675b757c65 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,16 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-02-27 22:13 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * utils/hbmk2/hbmk2.prg
+    + Added '-Wl,-static' option for gcc/*nix when -fullstatic
+      hbmk option is used. I hope this is fine. On my Ubuntu,
+      this says: '/usr/bin/ld: cannot find -lgcc_s'.
+    - Removed debug trace line left in.
+
+  * contrib/Makefile
+    ! Fixed commenting hbwhat.
+
 2009-02-27 21:12 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
    * INSTALL
      * Minor.
diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile
index db9ab78103..4c0b467fce 100644
--- a/harbour/contrib/Makefile
+++ b/harbour/contrib/Makefile
@@ -26,11 +26,12 @@ DIRS=\
 	hbtpathy \
 	hbvpdf \
 	hbwin \
-#	hbwhat \
 	hbziparc \
 	rddado \
 	xhb \
 
+#	hbwhat \
+
 # contribs with external dependencies
 DIRS +=\
 	gtalleg \
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index f9bd07079f..cd3da83448 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1027,6 +1027,9 @@ FUNCTION Main( ... )
          IF s_lMAP
             cOpt_CompC += " -Wl,-Map {OM}"
          ENDIF
+         IF s_lSTATICFULL
+            cOpt_CompC += " -Wl,-static"
+         ENDIF
          IF t_cARCH == "darwin"
             AAdd( s_aOPTC, "-no-cpp-precomp" )
             AAdd( s_aOPTC, "-Wno-long-double" )
@@ -1692,9 +1695,6 @@ FUNCTION Main( ... )
          IF ! Empty( cBin_CompC )
 
             /* Compiling */
-            IF s_lTRACE
-               OutStd( "hbmk: C compiler command options:" + hb_osNewLine() + cOpt_CompC + hb_osNewLine() )
-            ENDIF
 
             /* Order is significant */
             cOpt_CompC := StrTran( cOpt_CompC, "{LC}"  , ArrayToList( ArrayJoin( ListDirExt( s_aPRG, "", ".c" ), s_aC ) ) )