diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a2944f440d..5bcad2f42c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-11-01 17:02 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * include/hbdefs.h
+    * Changed HB_SIZE to ULONG. Added TOFIX to later change it 
+      to 'long'. With its current setup it's possible to gradually 
+      change 'ULONG' usages to 'HB_SIZE' when used as string/array 
+      length ot index. This can be a gradual process.
+
 2009-11-01 16:58 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * include/hbdefs.h
     + Added HB_MAX[U]INT as new name for HB_[U]LONG.
diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h
index 8ac4cd7244..4e0e035947 100644
--- a/harbour/include/hbdefs.h
+++ b/harbour/include/hbdefs.h
@@ -713,7 +713,7 @@ typedef unsigned int        HB_UINT;
    typedef ULONGLONG           HB_ULONGLONG;
 #endif
 typedef double              HB_DOUBLE;
-typedef long                HB_SIZE;
+typedef ULONG               HB_SIZE;           /* TOFIX: Change to 'long' */
 typedef void *              HB_PTRVAL;         /* TOFIX */
 /* typedef                     HB_POINTER;    */    /* TOFIX */