diff --git a/ChangeLog b/ChangeLog
index dbd87f87c..44344f1f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,13 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.5-dev, 2011-01-31
+v0.3.5-dev, 2011-02-01
 
 
 Version 0.3.5 (under dev!)
 --------------------------
 
+* core: fix terminal title when $TERM starts with "screen"
 * core: add some chars after cursor when scrolling input line: new option
   weechat.look.input_cursor_scroll (bug #21391)
 * core: dynamically allocate color pairs (extended colors can be used without
diff --git a/src/gui/curses/gui-curses-window.c b/src/gui/curses/gui-curses-window.c
index ad3e133be..0162d2b99 100644
--- a/src/gui/curses/gui-curses-window.c
+++ b/src/gui/curses/gui-curses-window.c
@@ -1465,10 +1465,10 @@ gui_window_set_title (const char *title)
             {
                 printf ("\33]0;%s\7", title);
             }
-            else if (strcmp (envterm, "screen") == 0)
+            else if (strncmp (envterm, "screen", 6) == 0)
             {
                 printf ("\033k%s\033\\", title);
-                /* tryning to set the title of a backgrounded xterm like terminal */
+                /* trying to set the title of a backgrounded xterm like terminal */
                 printf ("\33]0;%s\7", title);
             }
         }
@@ -1492,7 +1492,7 @@ gui_window_set_title (const char *title)
             {
                 printf ("\33]0;%s\7", "Terminal");
             }
-            else if (strcmp (envterm, "screen") == 0)
+            else if (strncmp (envterm, "screen", 6) == 0)
             {
                 if (envshell)
                 {