diff --git a/ChangeLog b/ChangeLog
index b601c934e..ef5fec159 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,11 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-11-09
+ChangeLog - 2006-11-14
 
 
 Version 0.2.2 (under dev!):
+   * fixed bug with DCC SEND when filename begins with '~'
    * added "irc_send_unknown_commands" option to send unknown commands to
      IRC server (OFF by default) (task #5947)
    * /charset command and charset conversions now made by "charset" plugin
diff --git a/src/irc/irc-dcc.c b/src/irc/irc-dcc.c
index be2e593e8..087ebf419 100644
--- a/src/irc/irc-dcc.c
+++ b/src/irc/irc-dcc.c
@@ -958,12 +958,14 @@ dcc_send_request (t_irc_server *server, int type, char *nick, char *filename)
     
     if (type == DCC_FILE_SEND)
     {
-        /* add home if filename not beginning with '/' (not for Win32) */
+        /* add home if filename not beginning with '/' or '~' (not for Win32) */
 #ifdef _WIN32
         filename2 = strdup (filename);
 #else
         if (filename[0] == '/')
             filename2 = strdup (filename);
+        else if (filename[0] == '~')
+            filename2 = weechat_strreplace (filename, "~", getenv ("HOME"));
         else
         {
             dir1 = weechat_strreplace (cfg_dcc_upload_path, "~", getenv ("HOME"));
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index b601c934e..ef5fec159 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,10 +1,11 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-11-09
+ChangeLog - 2006-11-14
 
 
 Version 0.2.2 (under dev!):
+   * fixed bug with DCC SEND when filename begins with '~'
    * added "irc_send_unknown_commands" option to send unknown commands to
      IRC server (OFF by default) (task #5947)
    * /charset command and charset conversions now made by "charset" plugin
diff --git a/weechat/src/irc/irc-dcc.c b/weechat/src/irc/irc-dcc.c
index be2e593e8..087ebf419 100644
--- a/weechat/src/irc/irc-dcc.c
+++ b/weechat/src/irc/irc-dcc.c
@@ -958,12 +958,14 @@ dcc_send_request (t_irc_server *server, int type, char *nick, char *filename)
     
     if (type == DCC_FILE_SEND)
     {
-        /* add home if filename not beginning with '/' (not for Win32) */
+        /* add home if filename not beginning with '/' or '~' (not for Win32) */
 #ifdef _WIN32
         filename2 = strdup (filename);
 #else
         if (filename[0] == '/')
             filename2 = strdup (filename);
+        else if (filename[0] == '~')
+            filename2 = weechat_strreplace (filename, "~", getenv ("HOME"));
         else
         {
             dir1 = weechat_strreplace (cfg_dcc_upload_path, "~", getenv ("HOME"));