diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 6e211785e6..46903c936b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,23 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-04-13 03:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    + Added TOFIX. There is a build error caused by gpm, when
+      trying to build 64-bit Harbour on a 32-bit Ubuntu (10.10)
+      Linux. gpm lib is not available in 64-bit form, but
+      32-bit hbmk2 is built flagged with HB_HAS_GPM, so when
+      run it will want to include gpm also for 64-bit target.
+      I'm not sure what is the solution for this. Ideally
+      hbmk2 should dynamically decide if gpm is really required
+      for a given target. It could f.e. look into gttrm lib
+      to check for this.
+      [ though maybe this build scenario is just too awkward
+      for any sane purpose, even more so because X11 is also
+      not available in 64-bit form, limiting its use even more.
+      Probably it's more realistic goal to cross-build 32-bit
+      targets on a 64-bit host. ]
+
 2011-04-13 22:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
   * utils/hbmk2/*.po
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 38aaac5f58..e7452b0295 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -5495,6 +5495,15 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
 
       /* Process build-time configuration */
 
+      /* TOFIX: This doesn't work well when doing cross-platform
+                build f.e. on a 32-bit *nix system to 64-bit target
+                where the 64-bit target doesn't happen to provide
+                64-bit flavor of gpm lib. This is the case when
+                building 64-bit target on a 32-bit Ubuntu 10.10
+                system. Moral of the story: we should decide about
+                gpm using dynamic information instead of using
+                hbmk2 build-time default HB_HAS_GPM value.
+                [vszakats] */
       #if defined( HB_HAS_GPM )
          IF hbmk[ _HBMK_cPLAT ] == "linux"
             FOR EACH tmp IN l_aLIBHB