diff --git a/ChangeLog b/ChangeLog
index 8d01dfb02..c2bd24885 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,13 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.8-dev, 2012-02-26
+v0.3.8-dev, 2012-02-29
 
 
 Version 0.3.8 (under dev!)
 --------------------------
 
+* irc: close server buffer when server is deleted
 * irc: add search for lower case nicks in option irc.look.nick_color_force
 
 Version 0.3.7 (2012-02-26)
diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c
index f2bfeac3a..c492ab0c7 100644
--- a/src/plugins/irc/irc-server.c
+++ b/src/plugins/irc/irc-server.c
@@ -1215,8 +1215,9 @@ irc_server_free (struct t_irc_server *server)
     if (!server)
         return;
 
-    /* close all channels/privates */
-    irc_channel_free_all (server);
+    /* close server buffer (and all channels/privates) */
+    if (server->buffer)
+        weechat_buffer_close (server->buffer);
 
     /* remove server from queue */
     if (last_irc_server == server)