diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4c05874672..c55ca001d3 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,13 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-06-08 22:10 UTC+0800 Pritpal Bedi (pritpal@vouchcac.com
+   * harbour/source/rtl/gtwvt/gtwvt.c
+     * Hack to fix maxrow() display. Now maximizing the window displays 
+       correctly on 25x80.
+   * harbour/tests/wvtext.pr
+     * More information.
+
 2008-06-09 06:25 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
    * tests/wvtext.prg
    * include/hbgtinfo.ch
diff --git a/harbour/source/rtl/gtwvt/gtwvt.c b/harbour/source/rtl/gtwvt/gtwvt.c
index d5ee99b3d0..c5be05adb7 100644
--- a/harbour/source/rtl/gtwvt/gtwvt.c
+++ b/harbour/source/rtl/gtwvt/gtwvt.c
@@ -714,7 +714,7 @@ static void hb_gt_wvt_FitSize( PHB_GTWVT pWVT, USHORT mode )
 
    if( bValid )
    {
-      maxHeight  = ci.bottom - ci.top ;
+      maxHeight  = ci.bottom - ci.top;
       maxWidth   = ci.right  - ci.left ;
       fontHeight = maxHeight / pWVT->ROWS;
       fontWidth  = maxWidth  / pWVT->COLS;
@@ -743,7 +743,7 @@ static void hb_gt_wvt_FitSize( PHB_GTWVT pWVT, USHORT mode )
             pWVT->fontWidth   = tm.tmAveCharWidth;
 
             pWVT->PTEXTSIZE.x = tm.tmAveCharWidth;
-            pWVT->PTEXTSIZE.y = tm.tmHeight;
+            pWVT->PTEXTSIZE.y = tm.tmHeight - ( pWVT->bMaximized ? 1 : 0 );   /* Hack to Disp MaxRow Correctly */
 
 #if defined(HB_WINCE)
             pWVT->FixedFont = FALSE;