diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4066c55bd3..f4342bb073 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,29 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-03-10 00:56 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/src/lang/msgbgiso.c
+    ! fixed typo in lang module name: "BGWIN" -> "BGISO"
+    ; TODO: sync codepage and land module names to use the same ID.
+            Now it's necessary to look at Harbour source code to find
+            corresponding modules.
+
+  * harbour/src/rtl/gtwvt/gtwvt.c
+    ! fixed GPF when fullscreen was enabled before console window is
+      created.
+      Now it's possible to enable full screen mode before application
+      starts without flickering window, i.e.:
+         #include "hbgtinfo.ch"
+         REQUEST HB_GT_WVT_DEFAULT
+         PROC main()
+            hb_gtInfo( HB_GTI_ISFULLSCREEN, .T. )
+            ? hb_datetime()
+            ? version()
+            ? hb_compiler()
+            ? hb_gtVersion(), hb_gtVersion(1)
+            WAIT
+         RETURN
+
 2011-03-10 00:40 UTC+0200 Petr Chornyj (myorg63 at mail.ru)
   + contrib/hbmlzo
   + contrib/hbmlzo/3rd
diff --git a/harbour/src/lang/msgbgiso.c b/harbour/src/lang/msgbgiso.c
index 360034dc04..c7f0ac7e47 100644
--- a/harbour/src/lang/msgbgiso.c
+++ b/harbour/src/lang/msgbgiso.c
@@ -61,7 +61,7 @@ static HB_LANG s_lang =
    {
       /* Identification */
 
-      "BGWIN",                     /* ID */
+      "BGISO",                     /* ID */
       "Bulgarian",                 /* Name (in English) */
       "Български",                 /* Name (in native language) */
       "BG",                        /* RFC ID */
diff --git a/harbour/src/rtl/gtwvt/gtwvt.c b/harbour/src/rtl/gtwvt/gtwvt.c
index fc57e200c5..c5c909a782 100644
--- a/harbour/src/rtl/gtwvt/gtwvt.c
+++ b/harbour/src/rtl/gtwvt/gtwvt.c
@@ -1921,6 +1921,11 @@ static HB_BOOL hb_gt_wvt_CreateConsoleWindow( PHB_GTWVT pWVT )
             AppendMenu( hSysMenu, MF_STRING, SYS_EV_MARK, pWVT->lpSelectCopy );
          }
       }
+      if( pWVT->bFullScreen )
+      {
+         pWVT->bFullScreen = HB_FALSE;
+         hb_gt_wvt_FullScreen( pWVT->pGT );
+      }
 
       ShowWindow( pWVT->hWnd, pWVT->iCmdShow );
       UpdateWindow( pWVT->hWnd );
@@ -2237,7 +2242,12 @@ static HB_BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
          if( hb_itemType( pInfo->pNewVal ) & HB_IT_LOGICAL )
          {
             if( hb_itemGetL( pInfo->pNewVal ) != pWVT->bFullScreen )
-               hb_gt_wvt_FullScreen( pGT );
+            {
+               if( pWVT->hWnd )
+                  hb_gt_wvt_FullScreen( pGT );
+               else
+                  pWVT->bFullScreen = hb_itemGetL( pInfo->pNewVal );
+            }
          }
          break;