diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index fd6ef1240a..70cbe8f773 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,7 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
-2011-06-01 11:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+2011-06-02 14:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbwin/wapi_winbase.c
+    ! fixed to pull proper default getlasterror value
+
+2011-06-02 11:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbwin/mapi.c
     ! fixed UNICODE conflict after recent LoadLibrary patch.
       this file has forced UNICODE off due to MS idiocy so I had
diff --git a/harbour/contrib/hbwin/wapi_winbase.c b/harbour/contrib/hbwin/wapi_winbase.c
index 430481a8ab..9109b6d2cf 100644
--- a/harbour/contrib/hbwin/wapi_winbase.c
+++ b/harbour/contrib/hbwin/wapi_winbase.c
@@ -280,7 +280,7 @@ HB_FUNC( WAPI_FORMATMESSAGE )
 
    dwRetVal = FormatMessage( ( DWORD ) hb_parnldef( 1, FORMAT_MESSAGE_FROM_SYSTEM ) /* dwFlags */,
                              HB_ISCHAR( 2 ) ? ( LPCVOID ) HB_PARSTR( 2, &hSource, NULL ) : hb_parptr( 2 ),
-                             HB_ISNUM( 3 ) ? ( DWORD ) hb_parnl( 3 ) : GetLastError() /* dwMessageId */,
+                             HB_ISNUM( 3 ) ? ( DWORD ) hb_parnl( 3 ) : hbwapi_GetLastError() /* dwMessageId */,
                              ( DWORD ) hb_parnldef( 4, MAKELANGID( LANG_NEUTRAL, SUBLANG_DEFAULT ) ) /* dwLanguageId */,
                              lpBuffer,
                              ( DWORD ) nBufferLen,