diff --git a/ChangeLog b/ChangeLog
index 515024cf6..341d55e34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,12 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-03-11
+ChangeLog - 2006-03-14
 
 
 Version 0.1.8 (under dev!):
+   * fixed /set command when internal server name contains one or many dots
+   * fixed get_info plugin API function when no server at all is opened
    * fixed display bug when top of buffer is displayed and first line is
      removed (according to "history_max_lines" setting)
    * fixed /mode command output
diff --git a/src/common/command.c b/src/common/command.c
index a2077dcdc..44bb5d63a 100644
--- a/src/common/command.c
+++ b/src/common/command.c
@@ -2973,7 +2973,7 @@ weechat_cmd_set (t_irc_server *server, t_irc_channel *channel,
     
     if (value)
     {
-        pos = strchr (option, '.');
+        pos = strrchr (option, '.');
         if (pos)
         {
             /* server config option modification */
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 515024cf6..341d55e34 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,10 +1,12 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-03-11
+ChangeLog - 2006-03-14
 
 
 Version 0.1.8 (under dev!):
+   * fixed /set command when internal server name contains one or many dots
+   * fixed get_info plugin API function when no server at all is opened
    * fixed display bug when top of buffer is displayed and first line is
      removed (according to "history_max_lines" setting)
    * fixed /mode command output
diff --git a/weechat/src/common/command.c b/weechat/src/common/command.c
index a2077dcdc..44bb5d63a 100644
--- a/weechat/src/common/command.c
+++ b/weechat/src/common/command.c
@@ -2973,7 +2973,7 @@ weechat_cmd_set (t_irc_server *server, t_irc_channel *channel,
     
     if (value)
     {
-        pos = strchr (option, '.');
+        pos = strrchr (option, '.');
         if (pos)
         {
             /* server config option modification */