diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c0477ae143..e8b0fe5305 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,19 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-06-20 23:20 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/rtl/gtchrmap.c
+    * removed 'static const' from s_szDefaultCharMapFile declaration
+      I forgot that it was used by some build scripts I made public
+      few years ago - I'll change these declaration when I'll add
+      alternative method of changing default charmap file.
+
+  * harbour/source/rtl/gttrm/gttrm.c
+    + added support for SetBlink(.f.) working like in GTCRS and GTSLN.
+      We cannot change from the server side the interpretation of BLINK
+      attribute in 99% of terminals (it has to be done on client side)
+      so SetBlink(.f.) simply disables sending BLINK attribute to terminal.
+
 2007-06-20 21:05 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbgtinfo.ch
     + added GTI_ADDKEYMAP and GTI_DELKEYMAP
diff --git a/harbour/source/rtl/gtchrmap.c b/harbour/source/rtl/gtchrmap.c
index 520683dd6d..9e8eae4a0d 100644
--- a/harbour/source/rtl/gtchrmap.c
+++ b/harbour/source/rtl/gtchrmap.c
@@ -61,7 +61,7 @@
 #include <string.h>
 
 #define MAX_CHAR_VAL	0xff
-static const char * s_szDefaultCharMapFile = "/etc/harbour/hb-charmap.def";
+char * s_szDefaultCharMapFile = "/etc/harbour/hb-charmap.def";
 
 static void skip_blank( char **buf )
 {
diff --git a/harbour/source/rtl/gttrm/gttrm.c b/harbour/source/rtl/gttrm/gttrm.c
index bb0f1957cc..8a5ec3270e 100644
--- a/harbour/source/rtl/gttrm/gttrm.c
+++ b/harbour/source/rtl/gttrm/gttrm.c
@@ -276,6 +276,7 @@ typedef struct
    int      iLineBufSize;
    BYTE *   pLineBuf;
    int      iCurrentSGR, iFgColor, iBgColor, iBold, iBlink, iACSC, iAM;
+   int      iAttrMask;
    int      iCursorStyle;
 
    BOOL     fStdinTTY;
@@ -1942,7 +1943,7 @@ static void hb_gt_trm_AnsiExit( void )
    HB_TRACE(HB_TR_DEBUG, ("hb_gt_trm_AnsiExit()"));
 
    /* set default color */
-   s_termState.SetAttributes( 0x07 );
+   s_termState.SetAttributes( 0x07 & s_termState.iAttrMask );
    s_termState.SetCursorStyle( SC_NORMAL );
    s_termState.SetTermMode( 1 );
 }
@@ -1975,7 +1976,7 @@ static void hb_gt_trm_PutStr( int iRow, int iCol, int iAttr, BYTE *pStr, int iLe
    if( s_termState.iOutBufSize )
    {
       s_termState.SetCursorPos( iRow, iCol );
-      s_termState.SetAttributes( iAttr );
+      s_termState.SetAttributes( iAttr & s_termState.iAttrMask );
       hb_gt_trm_termOutTrans( pStr, iLen, iAttr );
    }
 
@@ -2518,6 +2519,7 @@ static void hb_gt_trm_SetTerm( void )
    }
    s_termState.mouse_type = MOUSE_NONE;
    s_termState.esc_delay  = ESC_DELAY;
+   s_termState.iAttrMask  = ~0;
 
    szTerm = getenv("HB_TERM");
    if( szTerm == NULL || *szTerm == '\0' )
@@ -2658,6 +2660,7 @@ static void hb_gt_trm_Init( FHANDLE hFilenoStdin, FHANDLE hFilenoStdout, FHANDLE
    hb_gt_SetFlag( GTI_COMPATBUFFER, FALSE );
    hb_gt_SetFlag( GTI_STDOUTCON, s_termState.fStdoutTTY );
    hb_gt_SetFlag( GTI_STDERRCON, s_termState.fStderrTTY );
+   hb_gt_SetBlink( TRUE );
 
    s_termState.Init();
    s_termState.SetTermMode( 0 );
@@ -2888,6 +2891,18 @@ static BOOL hb_gt_trm_SetMode( int iRows, int iCols )
    return FALSE;
 }
 
+static void hb_gt_trm_SetBlink( BOOL fBlink )
+{
+   HB_TRACE( HB_TR_DEBUG, ( "hb_gt_trm_SetBlink(%d)", ( int ) fBlink ) );
+
+   if( fBlink )
+      s_termState.iAttrMask |= 0x0080;
+   else
+      s_termState.iAttrMask &= ~0x0080;
+
+   HB_GTSUPER_SETBLINK( fBlink );
+}
+
 static BOOL hb_gt_trm_SetDispCP( char *pszTermCDP, char *pszHostCDP, BOOL fBox )
 {
    HB_TRACE( HB_TR_DEBUG, ( "hb_gt_trm_SetDispCP(%s,%s,%d)", pszTermCDP, pszHostCDP, (int) fBox ) );
@@ -3103,6 +3118,7 @@ static BOOL hb_gt_FuncInit( PHB_GT_FUNCS pFuncTable )
    pFuncTable->OutStd                     = hb_gt_trm_OutStd;
    pFuncTable->OutErr                     = hb_gt_trm_OutErr;
    pFuncTable->SetMode                    = hb_gt_trm_SetMode;
+   pFuncTable->SetBlink                   = hb_gt_trm_SetBlink;
    pFuncTable->SetDispCP                  = hb_gt_trm_SetDispCP;
    pFuncTable->SetKeyCP                   = hb_gt_trm_SetKeyCP;
    pFuncTable->Tone                       = hb_gt_trm_Tone;