diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index b95962ac5..c4ef38542 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -38,6 +38,7 @@ Bug fixes::
   * core: fixed segfault during excessive evaluation in function string_repeat (issue #1400)
   * buflist: fix extra spaces between buffers when conditions are used to hide buffers (regression introduced in version 2.6) (issue #1403)
   * irc: remove option irc.network.channel_encode, add server option "charset_message" to control which part of the IRC message is decoded/encoded to the target charset (issue #832)
+  * irc: use path from option xfer.file.upload_path to complete filename in command "/dcc send" (issue #60)
   * xfer: fix memory leak when a xfer is freed and when the plugin is unloaded
 
 Tests::
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c
index d4ca47ede..31a78be44 100644
--- a/src/plugins/irc/irc-command.c
+++ b/src/plugins/irc/irc-command.c
@@ -6515,7 +6515,8 @@ irc_command_init ()
            "  send file \"/home/foo/bar.txt\" to nick \"toto\":\n"
            "    /dcc send toto /home/foo/bar.txt"),
         "chat %(nicks)"
-        " || send %(nicks) %(filename)",
+        " || send %(nicks) "
+        "%(filename:${modifier:eval_path_home,,${xfer.file.upload_path}})",
         &irc_command_dcc, NULL, NULL);
     weechat_hook_command (
         "dehalfop",