diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2bb0f0d87c..3f0d48e916 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,11 +17,19 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-03 00:11 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * src/vm/fm.c
+    ! Fixed to not display "Warning, memory allocated but not released"
+      message for non-fmstat builds.
+    ! Fixed to display "Memory allocated but not released: none" message
+      (without 'warning' sign) when built with fmstat and there was no
+      unrelease blocks.
+
 2010-01-02 23:07 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
-   * config/dir.mk
-     % Deleted code handling pre-3.81 GNU Make versions.
-       We require 3.81 now, so no longer required.
-       Sent by Tamas Tevesz.
+  * config/dir.mk
+    % Deleted code handling pre-3.81 GNU Make versions.
+      We require 3.81 now, so no longer required.
+      Sent by Tamas Tevesz.
 
 2009-01-02 22:59 UTC+0100 Istvan Bisz (istvan.bisz/at/t-online.hu)
   * /src/vm/fm.c
diff --git a/harbour/src/vm/fm.c b/harbour/src/vm/fm.c
index f8d89b89e2..ba9d94698a 100644
--- a/harbour/src/vm/fm.c
+++ b/harbour/src/vm/fm.c
@@ -1102,10 +1102,6 @@ void hb_xexit( void ) /* Deinitialize fixed memory subsystem */
       hb_conOutErr( hb_conNewLine(), 0 );
       hb_snprintf( buffer, sizeof( buffer ), HB_I_("Total memory allocated: %li bytes (%li block(s))"), s_lMemoryMaxConsumed, s_lMemoryMaxBlocks );
       hb_conOutErr( buffer, 0 );
-      hb_conOutErr( hb_conNewLine(), 0 );
-      hb_snprintf( buffer, sizeof( buffer ), HB_I_("Warning, memory allocated but not released: %li bytes (%li block(s))"), s_lMemoryConsumed, s_lMemoryBlocks );
-      hb_conOutErr( buffer, 0 );
-      hb_conOutErr( hb_conNewLine(), 0 );
 
       if( s_lMemoryBlocks )
       {
@@ -1124,9 +1120,23 @@ void hb_xexit( void ) /* Deinitialize fixed memory subsystem */
             fprintf( hLog, "%s\n", buffer );
          }
 
+         hb_conOutErr( hb_conNewLine(), 0 );
+         hb_snprintf( buffer, sizeof( buffer ), HB_I_("Warning, memory allocated but not released: %li bytes (%li block(s))"), s_lMemoryConsumed, s_lMemoryBlocks );
+         hb_conOutErr( buffer, 0 );
+
          if( hLog )
             fprintf( hLog, "%s\n", buffer );
       }
+      else
+      {
+#ifdef HB_FM_STATISTICS
+         hb_conOutErr( hb_conNewLine(), 0 );
+         hb_snprintf( buffer, sizeof( buffer ), HB_I_("Memory allocated but not released: none") );
+         hb_conOutErr( buffer, 0 );
+#endif
+      }
+
+      hb_conOutErr( hb_conNewLine(), 0 );
 
       for( ui = 1, pMemBlock = s_pFirstBlock; pMemBlock; pMemBlock = pMemBlock->pNextBlock, ++ui )
       {