diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5d07dd76c0..1328714bdc 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-04-26 16:26 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * utils/hbmk2/hbmk2.prg
+    * LEN() -> HB_BLEN() where needed. (some for the sake
+      of clean code, one as an actual fix)
+
 2012-04-26 16:13 UTC+0200 Viktor Szakats (harbour syenar.net)
   * utils/hbmk2/hbmk2.prg
     + hbmk2 code made compatible with UTF8 HVM CP
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 14f0acc1b3..0f96093b10 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -10617,7 +10617,7 @@ STATIC FUNCTION rtlnk_read( cFileName, aPrevFiles )
       IF ( hFile := FOpen( cFileName ) ) != -1
          cFileBody := Space( FSeek( hFile, 0, FS_END ) )
          FSeek( hFile, 0, FS_SET )
-         IF FRead( hFile, @cFileBody, Len( cFileBody ) ) != Len( cFileBody )
+         IF FRead( hFile, @cFileBody, hb_BLen( cFileBody ) ) != hb_BLen( cFileBody )
             cFileBody := NIL
          ENDIF
          FClose( hFile )
@@ -11005,8 +11005,8 @@ STATIC FUNCTION IsCOFFLib( cFileName )
    LOCAL cBuffer
 
    IF fhnd != F_ERROR
-      cBuffer := Space( Len( _COFF_LIB_SIGNATURE ) )
-      FRead( fhnd, @cBuffer, Len( cBuffer ) )
+      cBuffer := Space( hb_BLen( _COFF_LIB_SIGNATURE ) )
+      FRead( fhnd, @cBuffer, hb_BLen( cBuffer ) )
       FClose( fhnd )
       IF cBuffer == _COFF_LIB_SIGNATURE
          RETURN .T.
@@ -11023,7 +11023,7 @@ STATIC FUNCTION IsOMFLib( cFileName )
 
    IF fhnd != F_ERROR
       cBuffer := Space( hb_BLen( _OMF_LIB_SIGNATURE ) )
-      FRead( fhnd, @cBuffer, Len( cBuffer ) )
+      FRead( fhnd, @cBuffer, hb_BLen( cBuffer ) )
       FClose( fhnd )
       IF cBuffer == _OMF_LIB_SIGNATURE
          RETURN .T.