diff --git a/ChangeLog b/ChangeLog
index 5959f09c2..33b3c5010 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.4.2-dev, 2013-07-18
+v0.4.2-dev, 2013-07-19
 
 
 This document lists all changes for each version.
@@ -34,6 +34,8 @@ Version 0.4.2 (under dev!)
 * core: fix line alignment when option weechat.look.buffer_time_format is set
   to empty string
 * aspell: add support of enchant library (patch #6858)
+* irc: fix self nick color in server messages after nick is changed with /nick
+  (bug #39415)
 * irc: add support of wildcards in commands (de)op/halfop/voice (task #9221)
 * irc: add option irc.look.pv_tags
 * irc: fix error message on /invite without arguments (bug #39272)
diff --git a/src/plugins/irc/irc-nick.c b/src/plugins/irc/irc-nick.c
index d6adf1c8d..729f381d7 100644
--- a/src/plugins/irc/irc-nick.c
+++ b/src/plugins/irc/irc-nick.c
@@ -709,7 +709,7 @@ irc_nick_change (struct t_irc_server *server, struct t_irc_channel *channel,
     irc_nick_nicklist_remove (server, channel, nick);
 
     /* update nicks speaking */
-    nick_is_me = (irc_server_strcasecmp (server, nick->name, server->nick) == 0) ? 1 : 0;
+    nick_is_me = (irc_server_strcasecmp (server, new_nick, server->nick) == 0) ? 1 : 0;
     if (!nick_is_me)
         irc_channel_nick_speaking_rename (channel, nick->name, new_nick);