diff --git a/ChangeLog b/ChangeLog
index ffbf69cab..5519efeed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@ WeeChat - Wee Enhanced Environment for Chat
 
 ChangeLog - 2006-05-25
 
+Version 0.2.0 (under dev!):
+   * fixed random crash at exit (/quit or /upgrade) with splited windows
+
 Version 0.1.9 (2006-05-25):
    * fixed /squery command (message sent to server, now ok with # args > 2)
    * fixed /alias command (with an alias name, display content)
diff --git a/src/gui/curses/gui-curses-main.c b/src/gui/curses/gui-curses-main.c
index f0a454ab2..6ce58d631 100644
--- a/src/gui/curses/gui-curses-main.c
+++ b/src/gui/curses/gui-curses-main.c
@@ -328,15 +328,14 @@ gui_main_end ()
     while (gui_panels)
         gui_panel_free (gui_panels);
 
-    /* delete all buffers */
-    gui_window_merge_all (gui_current_window);
-    while (gui_buffers)
-      gui_buffer_free (gui_buffers, 0);
-    
     /* delete all windows */
     while (gui_windows)
         gui_window_free (gui_windows);
     gui_window_tree_free (&gui_windows_tree);
+
+    /* delete all buffers */
+    while (gui_buffers)
+        gui_buffer_free (gui_buffers, 0);
     
     /* delete global history */
     history_global_free ();
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index ffbf69cab..5519efeed 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -3,6 +3,9 @@ WeeChat - Wee Enhanced Environment for Chat
 
 ChangeLog - 2006-05-25
 
+Version 0.2.0 (under dev!):
+   * fixed random crash at exit (/quit or /upgrade) with splited windows
+
 Version 0.1.9 (2006-05-25):
    * fixed /squery command (message sent to server, now ok with # args > 2)
    * fixed /alias command (with an alias name, display content)
diff --git a/weechat/src/gui/curses/gui-curses-main.c b/weechat/src/gui/curses/gui-curses-main.c
index f0a454ab2..6ce58d631 100644
--- a/weechat/src/gui/curses/gui-curses-main.c
+++ b/weechat/src/gui/curses/gui-curses-main.c
@@ -328,15 +328,14 @@ gui_main_end ()
     while (gui_panels)
         gui_panel_free (gui_panels);
 
-    /* delete all buffers */
-    gui_window_merge_all (gui_current_window);
-    while (gui_buffers)
-      gui_buffer_free (gui_buffers, 0);
-    
     /* delete all windows */
     while (gui_windows)
         gui_window_free (gui_windows);
     gui_window_tree_free (&gui_windows_tree);
+
+    /* delete all buffers */
+    while (gui_buffers)
+        gui_buffer_free (gui_buffers, 0);
     
     /* delete global history */
     history_global_free ();