diff --git a/ChangeLog b/ChangeLog
index d1f611191..ba9449914 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ Version 0.3.9 (under dev!)
 * core: reallow names beginning with "#" for bars, proxies and filters
 * core: escape special chars (`#[\`) in configuration files for name of options
   (bug #36584)
+* irc: reallow names beginning with "#" for servers
 
 Version 0.3.8 (2012-06-03)
 --------------------------
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index 11bec2b98..f15ffdd2e 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -3852,13 +3852,6 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc,
                             ptr_server2->name);
             return WEECHAT_RC_OK;
         }
-        if (argv[2][0] == '#')
-        {
-            weechat_printf (NULL,
-                            _("%s%s: name can not start with \"#\""),
-                            weechat_prefix ("error"), IRC_PLUGIN_NAME);
-            return WEECHAT_RC_OK;
-        }
 
         new_server = irc_server_alloc (argv[2]);
         if (!new_server)