diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc
index 9440d4e68..4236df06e 100644
--- a/ChangeLog.asciidoc
+++ b/ChangeLog.asciidoc
@@ -139,6 +139,8 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 * scripts: fix crash when a signal is received with type "int" and NULL pointer
   in signal_data
 * trigger: add trigger plugin: new command /trigger and file trigger.conf
+* xfer: fix problem with option xfer.file.auto_accept_nicks when the server
+  name contains dots
 * xfer: fix freeze/problems when sending empty files with DCC (closes #53)
 * xfer: fix connection to remote host in DCC receive on Mac OS X (closes #25)
 * xfer: remove bind on xfer.network.own_ip (closes #5)
diff --git a/src/plugins/xfer/xfer.c b/src/plugins/xfer/xfer.c
index 4d8ec2615..0839eafd9 100644
--- a/src/plugins/xfer/xfer.c
+++ b/src/plugins/xfer/xfer.c
@@ -527,7 +527,7 @@ xfer_nick_auto_accepted (const char *server, const char *nick)
     {
         for (i = 0; i < num_nicks; i++)
         {
-            pos = strchr (nicks[i], '.');
+            pos = strrchr (nicks[i], '.');
             if (pos)
             {
                 if ((weechat_strncasecmp (server, nicks[i], pos - nicks[i]) == 0)