diff --git a/ChangeLog b/ChangeLog
index be819a832..22886420e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.5-dev, 2011-02-04
+v0.3.5-dev, 2011-02-05
 
 
 Version 0.3.5 (under dev!)
@@ -11,6 +11,7 @@ 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: add color "gray"
 * core: dynamically allocate color pairs (extended colors can be used without
   being added with command "/color")
 * core: allow background for nick colors (using "/")
diff --git a/doc/de/weechat_user.de.txt b/doc/de/weechat_user.de.txt
index 7d927c00c..6d0905a0d 100644
--- a/doc/de/weechat_user.de.txt
+++ b/doc/de/weechat_user.de.txt
@@ -821,7 +821,7 @@ zu deaktivieren.
 
 Farbtabelle für ^Cc:
 
-[width="35%",cols="^1m,3,3",options="header"]
+[width="50%",cols="^1m,3,3",options="header"]
 |========================================
 | Code | IRC           | WeeChat (curses)
 | 00   | weiß          | white
@@ -838,7 +838,7 @@ Farbtabelle für ^Cc:
 | 11   | hell türkis   | lightcyan
 | 12   | hellblau      | lightblue
 | 13   | hell magenta  | lightmagenta
-| 14   | grau          | default
+| 14   | grau          | gray
 | 15   | hellgrau      | white
 |========================================
 
@@ -939,6 +939,7 @@ Basisfarben in WeeChat sind:
 | lightmagenta | hell magenta
 | cyan         | dunkel türkis
 | lightcyan    | hell türkis
+| gray         | grau
 | white        | weiß
 |========================================
 
diff --git a/doc/en/weechat_user.en.txt b/doc/en/weechat_user.en.txt
index a5f9058a3..44bcb1827 100644
--- a/doc/en/weechat_user.en.txt
+++ b/doc/en/weechat_user.en.txt
@@ -822,7 +822,7 @@ attribute.
 
 Color codes for ^Cc are:
 
-[width="35%",cols="^1m,3,3",options="header"]
+[width="50%",cols="^1m,3,3",options="header"]
 |========================================
 | Code | IRC           | WeeChat (curses)
 | 00   | white         | white
@@ -839,7 +839,7 @@ Color codes for ^Cc are:
 | 11   | light cyan    | lightcyan
 | 12   | light blue    | lightblue
 | 13   | light magenta | lightmagenta
-| 14   | gray          | default
+| 14   | gray          | gray
 | 15   | light gray    | white
 |========================================
 
@@ -935,6 +935,7 @@ Basic colors in WeeChat are:
 | lightmagenta | light magenta
 | cyan         | dark cyan
 | lightcyan    | light cyan
+| gray         | gray
 | white        | white
 |========================================
 
diff --git a/doc/fr/weechat_user.fr.txt b/doc/fr/weechat_user.fr.txt
index 09302ca44..ee30462c5 100644
--- a/doc/fr/weechat_user.fr.txt
+++ b/doc/fr/weechat_user.fr.txt
@@ -843,7 +843,7 @@ l'attribut défini.
 
 Les codes couleur pour ^Cc sont :
 
-[width="35%",cols="^1m,3,3",options="header"]
+[width="50%",cols="^1m,3,3",options="header"]
 |========================================
 | Code | IRC          | WeeChat (curses)
 | 00   | blanc        | white
@@ -860,7 +860,7 @@ Les codes couleur pour ^Cc sont :
 | 11   | cyan clair   | lightcyan
 | 12   | bleu clair   | lightblue
 | 13   | violet clair | lightmagenta
-| 14   | gris         | default
+| 14   | gris         | gray
 | 15   | gris clair   | white
 |========================================
 
@@ -958,6 +958,7 @@ Les couleurs de base dans WeeChat sont :
 | lightmagenta | violet clair
 | cyan         | cyan foncé
 | lightcyan    | cyan clair
+| gray         | gray
 | white        | white
 |========================================
 
diff --git a/doc/it/weechat_user.it.txt b/doc/it/weechat_user.it.txt
index c4e3d0b76..d879af973 100644
--- a/doc/it/weechat_user.it.txt
+++ b/doc/it/weechat_user.it.txt
@@ -855,7 +855,7 @@ I codici colore per ^Cc sono:
 | 11     | azzurro chiaro | lightcyan
 | 12     | blu chiaro     | lightblue
 | 13     | rosa chiaro    | lightmagenta
-| 14     | grigio         | default
+| 14     | grigio         | gray
 | 15     | grigio chiaro  | white
 |=======================================
 
@@ -931,7 +931,7 @@ niente panico! È possibile cambiarla senza riavviare, grazie allo script 'shell
 
 [[colors_basic]]
 Colori base
-^^^^^^^^^^^^
+^^^^^^^^^^^
 
 I colori base in WeeChat sono:
 
@@ -953,6 +953,7 @@ I colori base in WeeChat sono:
 | lightmagenta | rosa chiaro
 | cyan         | azzurro scuro
 | lightcyan    | azzurro chiaro
+| gray         | grigio
 | white        | bianco
 |========================================
 
diff --git a/src/gui/curses/gui-curses-color.c b/src/gui/curses/gui-curses-color.c
index 5bf16eb49..c1cb4a179 100644
--- a/src/gui/curses/gui-curses-color.c
+++ b/src/gui/curses/gui-curses-color.c
@@ -62,7 +62,8 @@ struct t_gui_color gui_weechat_colors[GUI_CURSES_NUM_WEECHAT_COLORS + 1] =
   { COLOR_MAGENTA, COLOR_MAGENTA + 8, A_BOLD, "lightmagenta" },
   { COLOR_CYAN,    COLOR_CYAN,        0,      "cyan"         },
   { COLOR_CYAN,    COLOR_CYAN + 8,    A_BOLD, "lightcyan"    },
-  { COLOR_WHITE,   COLOR_WHITE,       A_BOLD, "white"        },
+  { COLOR_WHITE,   COLOR_WHITE,       0,      "gray"         },
+  { COLOR_WHITE,   COLOR_WHITE + 8,   A_BOLD, "white"        },
   { 0,             0,                 0,      NULL           }
 };
 
diff --git a/src/gui/curses/gui-curses.h b/src/gui/curses/gui-curses.h
index efb686a69..3fb339d57 100644
--- a/src/gui/curses/gui-curses.h
+++ b/src/gui/curses/gui-curses.h
@@ -36,7 +36,7 @@ struct t_gui_buffer;
 struct t_gui_window;
 struct t_gui_bar_window;
 
-#define GUI_CURSES_NUM_WEECHAT_COLORS 16
+#define GUI_CURSES_NUM_WEECHAT_COLORS 17
 
 #define GUI_WINDOW_OBJECTS(window)                                      \
     ((struct t_gui_window_curses_objects *)(window->gui_objects))
diff --git a/src/plugins/irc/irc-color.c b/src/plugins/irc/irc-color.c
index 6afa011a1..4d5b2eed7 100644
--- a/src/plugins/irc/irc-color.c
+++ b/src/plugins/irc/irc-color.c
@@ -47,7 +47,7 @@ char *irc_color_to_weechat[IRC_NUM_COLORS] =
   /* 11 */ "lightcyan",
   /* 12 */ "lightblue",
   /* 13 */ "lightmagenta",
-  /* 14 */ "default",
+  /* 14 */ "gray",
   /* 15 */ "white"
 };