diff --git a/ChangeLog b/ChangeLog
index 96f24fa02..8bc9439a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,11 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-01-03
+ChangeLog - 2006-01-08
 
 
 Version 0.1.7 (under dev!):
+   * fixed refresh bug with Solaris when term size is changed
    * replaced Texinfo doc by XML Docbook
    * added color for window separators (when splited)
    * added completion system for plugins/scripts commands
diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c
index f9c5e9303..782f401f6 100644
--- a/src/gui/curses/gui-display.c
+++ b/src/gui/curses/gui-display.c
@@ -3253,6 +3253,17 @@ gui_refresh_screen ()
         gui_refresh_windows ();
 }
 
+/*
+ * gui_refresh_screen_sigwinch: called when signal SIGWINCH is received
+ */
+
+void
+gui_refresh_screen_sigwinch ()
+{
+    gui_refresh_screen ();
+    signal (SIGWINCH, gui_refresh_screen_sigwinch);
+}
+
 /*
  * gui_pre_init: pre-initialize GUI (called before gui_init)
  */
@@ -3508,7 +3519,7 @@ gui_init ()
         gui_current_window = gui_windows;
         gui_buffer_new (gui_windows, NULL, NULL, 0, 1);
     
-        signal (SIGWINCH, gui_refresh_screen);
+        signal (SIGWINCH, gui_refresh_screen_sigwinch);
 	
         if (cfg_look_set_title)
             gui_set_window_title ();
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 96f24fa02..8bc9439a7 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,10 +1,11 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-01-03
+ChangeLog - 2006-01-08
 
 
 Version 0.1.7 (under dev!):
+   * fixed refresh bug with Solaris when term size is changed
    * replaced Texinfo doc by XML Docbook
    * added color for window separators (when splited)
    * added completion system for plugins/scripts commands
diff --git a/weechat/src/gui/curses/gui-display.c b/weechat/src/gui/curses/gui-display.c
index f9c5e9303..782f401f6 100644
--- a/weechat/src/gui/curses/gui-display.c
+++ b/weechat/src/gui/curses/gui-display.c
@@ -3253,6 +3253,17 @@ gui_refresh_screen ()
         gui_refresh_windows ();
 }
 
+/*
+ * gui_refresh_screen_sigwinch: called when signal SIGWINCH is received
+ */
+
+void
+gui_refresh_screen_sigwinch ()
+{
+    gui_refresh_screen ();
+    signal (SIGWINCH, gui_refresh_screen_sigwinch);
+}
+
 /*
  * gui_pre_init: pre-initialize GUI (called before gui_init)
  */
@@ -3508,7 +3519,7 @@ gui_init ()
         gui_current_window = gui_windows;
         gui_buffer_new (gui_windows, NULL, NULL, 0, 1);
     
-        signal (SIGWINCH, gui_refresh_screen);
+        signal (SIGWINCH, gui_refresh_screen_sigwinch);
 	
         if (cfg_look_set_title)
             gui_set_window_title ();