diff --git a/ChangeLog b/ChangeLog
index 19c5a236a..644bf85c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 WeeChat ChangeLog
 =================
 FlashCode <flashcode@flashtux.org>
-v0.3.1-dev, 2010-01-08
+v0.3.1-dev, 2010-01-11
 
 
 Version 0.3.1 (under dev!)
@@ -31,17 +31,18 @@ Version 0.3.1 (under dev!)
   (task #7492, debian #453348)
 * irc: check SSL certificates (task #7492)
 * irc: add option "autorejoin_delay" for servers (task #8771)
-* irc: fix autorejoin on channels with key
 * irc: add option to use same nick color in channel and private (task #9870)
 * irc: add missing command 275 (patch #6952)
 * irc: add commands /sajoin, /samode, /sanick, /sapart, /saquit (task #9770)
 * irc: add options for CTCP, to block/customize CTCP reply (task #9693)
 * irc: add missing CTCP: clientinfo, finger, source, time, userinfo (task #7270)
 * irc: add all server options for commands /server and /connect
-* irc: fix command /connect (options -ssl, -ipv6 and -port) (bug #27486)
+* irc: add arguments for command /rehash
 * irc: improve error management on socket error (recv/send)
 * irc: improve mask used by command /kickban
-* irc: add arguments for command /rehash
+* irc: fix nick color for nicks with wide chars (bug #28547)
+* irc: fix autorejoin on channels with key
+* irc: fix command /connect (options -ssl, -ipv6 and -port) (bug #27486)
 * xfer: add missing charset decoding/encoding for IRC DCC chat (bug #27482)
 * ruby: support of Ruby >= 1.9.1 (patch #6989)
 * fifo: remove old pipes before creating new pipe
diff --git a/src/plugins/irc/irc-nick.c b/src/plugins/irc/irc-nick.c
index e47463dfe..cd3aeb34a 100644
--- a/src/plugins/irc/irc-nick.c
+++ b/src/plugins/irc/irc-nick.c
@@ -63,17 +63,20 @@ irc_nick_valid (struct t_irc_channel *channel, struct t_irc_nick *nick)
 const char *
 irc_nick_find_color (const char *nickname)
 {
-    int i, color;
+    int color;
     char color_name[64];
+    const char *ptr_nick;
     
     color = 0;
-    for (i = strlen (nickname) - 1; i >= 0; i--)
+    ptr_nick = nickname;
+    while (ptr_nick && ptr_nick[0])
     {
-        color += (int)(nickname[i]);
+        color += weechat_utf8_char_int (ptr_nick);
+        ptr_nick = weechat_utf8_next_char (ptr_nick);
     }
     color = (color %
              weechat_config_integer (weechat_config_get ("weechat.look.color_nicks_number")));
-
+    
     snprintf (color_name, sizeof (color_name),
               "chat_nick_color%02d", color + 1);