diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index af83a22cd0..1da345cf72 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,12 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-02-17 01:50 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * contrib/hbfimage/Makefile
+    ! Disabled hbfimage on Linux until we solve the type
+      collision problem. Some more platforms may need to
+      be added.
+
 2009-02-17 01:39 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * config/linux/install.cf
     ! Added hack to ignore copy errors.
diff --git a/harbour/contrib/hbfimage/Makefile b/harbour/contrib/hbfimage/Makefile
index 1b00256c60..69c21fede3 100644
--- a/harbour/contrib/hbfimage/Makefile
+++ b/harbour/contrib/hbfimage/Makefile
@@ -9,6 +9,8 @@ LIBNAME=hbfimage
 HB_INC_FREEIMAGE_OK =
 
 ifneq ($(HB_ARCHITECTURE),dos)
+# disabled until a proper solution isn't found for type collision
+ifneq ($(HB_ARCHITECTURE),linux)
 
 ifeq ($(HB_INC_FREEIMAGE),)
 ifeq ($(HB_XBUILD),)
@@ -42,3 +44,6 @@ install::
 else
 include $(TOP)$(ROOT)config/none.cf
 endif
+else
+include $(TOP)$(ROOT)config/none.cf
+endif