diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4475374adf..f0f02f68c3 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,11 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-05-31 15:33 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/src/rtl/gttrm/gttrm.c
+    * gives higher priority for PuTTY terminal autodetection then for
+      envvar [HB_]TERM=linux
+
 2011-05-31 00:02 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/setup.ui
     + Started: few more user-definable elements to manage docking 
diff --git a/harbour/src/rtl/gttrm/gttrm.c b/harbour/src/rtl/gttrm/gttrm.c
index c4dfaf6136..b704651277 100644
--- a/harbour/src/rtl/gttrm/gttrm.c
+++ b/harbour/src/rtl/gttrm/gttrm.c
@@ -2961,29 +2961,11 @@ static void hb_gt_trm_SetTerm( PHB_GTTRM pTerm )
    }
 
 
-   if( strncmp( szTerm, "linux", 5 ) == 0 ||
-       strcmp( szTerm, "tterm" ) == 0 ||
-       strcmp( szTerm, "teraterm" ) == 0 )
-   {
-      pTerm->Init           = hb_gt_trm_AnsiInit;
-      pTerm->Exit           = hb_gt_trm_AnsiExit;
-      pTerm->SetTermMode    = hb_gt_trm_LinuxSetTermMode;
-      pTerm->GetCursorPos   = hb_gt_trm_AnsiGetCursorPos;
-      pTerm->SetCursorPos   = hb_gt_trm_AnsiSetCursorPos;
-      pTerm->SetCursorStyle = hb_gt_trm_LinuxSetCursorStyle;
-      pTerm->SetAttributes  = hb_gt_trm_AnsiSetAttributes;
-      pTerm->SetMode        = hb_gt_trm_AnsiSetMode;
-      pTerm->GetAcsc        = hb_gt_trm_AnsiGetAcsc;
-      pTerm->Tone           = hb_gt_trm_LinuxTone;
-      pTerm->Bell           = hb_gt_trm_AnsiBell;
-      pTerm->szAcsc         = szExtAcsc;
-      pTerm->terminal_type  = TERM_LINUX;
-   }
-   else if( ( pTerm->terminal_ext & TERM_PUTTY ) ||
-            strstr( szTerm, "xterm" ) != NULL ||
-            strncmp( szTerm, "rxvt", 4 ) == 0 ||
-            strcmp( szTerm, "putty" ) == 0 ||
-            strncmp( szTerm, "screen", 6 ) == 0 )
+   if( ( pTerm->terminal_ext & TERM_PUTTY ) ||
+       strstr( szTerm, "xterm" ) != NULL ||
+       strncmp( szTerm, "rxvt", 4 ) == 0 ||
+       strcmp( szTerm, "putty" ) == 0 ||
+       strncmp( szTerm, "screen", 6 ) == 0 )
    {
       pTerm->Init           = hb_gt_trm_AnsiInit;
       pTerm->Exit           = hb_gt_trm_AnsiExit;
@@ -2999,6 +2981,24 @@ static void hb_gt_trm_SetTerm( PHB_GTTRM pTerm )
       pTerm->szAcsc         = szAcsc;
       pTerm->terminal_type  = TERM_XTERM;
    }
+   else if( strncmp( szTerm, "linux", 5 ) == 0 ||
+            strcmp( szTerm, "tterm" ) == 0 ||
+            strcmp( szTerm, "teraterm" ) == 0 )
+   {
+      pTerm->Init           = hb_gt_trm_AnsiInit;
+      pTerm->Exit           = hb_gt_trm_AnsiExit;
+      pTerm->SetTermMode    = hb_gt_trm_LinuxSetTermMode;
+      pTerm->GetCursorPos   = hb_gt_trm_AnsiGetCursorPos;
+      pTerm->SetCursorPos   = hb_gt_trm_AnsiSetCursorPos;
+      pTerm->SetCursorStyle = hb_gt_trm_LinuxSetCursorStyle;
+      pTerm->SetAttributes  = hb_gt_trm_AnsiSetAttributes;
+      pTerm->SetMode        = hb_gt_trm_AnsiSetMode;
+      pTerm->GetAcsc        = hb_gt_trm_AnsiGetAcsc;
+      pTerm->Tone           = hb_gt_trm_LinuxTone;
+      pTerm->Bell           = hb_gt_trm_AnsiBell;
+      pTerm->szAcsc         = szExtAcsc;
+      pTerm->terminal_type  = TERM_LINUX;
+   }
    else if( strncmp( szTerm, "cons", 4 ) == 0 )
    {
       pTerm->Init           = hb_gt_trm_AnsiInit;