diff --git a/ChangeLog b/ChangeLog
index d33090dab..657f283f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,16 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.8-dev, 2012-05-08
+v0.3.8-dev, 2012-05-11
 
 
 Version 0.3.8 (under dev!)
 --------------------------
 
+* core: support lines of 16 Kb long in configuration files (instead of 1 Kb)
 * core: fix crash in focus hook for nicklist (bug #36271)
-* core: fix truncated config files (zero-length) after system crash (bug #36383)
+* core: fix truncated configuration files (zero-length) after system crash
+  (bug #36383)
 * core: fix display bugs and crashs with small windows (bug #36107)
 * core: convert options weechat.look.prefix_align_more and
   weechat.look.prefix_buffer_align_more from boolean to string (task #11197)
diff --git a/src/core/wee-config-file.c b/src/core/wee-config-file.c
index 5ea91ef9e..234cceba5 100644
--- a/src/core/wee-config-file.c
+++ b/src/core/wee-config-file.c
@@ -2081,7 +2081,7 @@ config_file_read_internal (struct t_config_file *config_file, int reload)
     char *filename;
     struct t_config_section *ptr_section;
     struct t_config_option *ptr_option;
-    char line[1024], *ptr_line, *ptr_line2, *pos, *pos2;
+    char line[16384], *ptr_line, *ptr_line2, *pos, *pos2;
 
     if (!config_file)
         return WEECHAT_CONFIG_READ_FILE_NOT_FOUND;