diff --git a/ChangeLog b/ChangeLog
index 0e89ad06c..05559cd19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,12 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-10-08
+ChangeLog - 2006-10-09
 
 
 Version 0.2.2 (under dev!):
+   * fixed bug with /alias and arguments (like $1), now text after
+     argument(s) is used (bug #17944)
    * fixed minor display bug with special chars on some arch like PPC
 
 Version 0.2.1 (2006-10-01):
diff --git a/src/common/alias.c b/src/common/alias.c
index e60e08999..46c4ea250 100644
--- a/src/common/alias.c
+++ b/src/common/alias.c
@@ -275,6 +275,9 @@ alias_replace_args (char *alias_args, char *user_args)
                 pos++;
         }
     }
+    if (start < pos)
+        alias_add_word (&res, &length_res, start);
+    
     if (argv)
         free_exploded_string (argv);
     return res;
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index 0e89ad06c..05559cd19 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,10 +1,12 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2006-10-08
+ChangeLog - 2006-10-09
 
 
 Version 0.2.2 (under dev!):
+   * fixed bug with /alias and arguments (like $1), now text after
+     argument(s) is used (bug #17944)
    * fixed minor display bug with special chars on some arch like PPC
 
 Version 0.2.1 (2006-10-01):
diff --git a/weechat/src/common/alias.c b/weechat/src/common/alias.c
index e60e08999..46c4ea250 100644
--- a/weechat/src/common/alias.c
+++ b/weechat/src/common/alias.c
@@ -275,6 +275,9 @@ alias_replace_args (char *alias_args, char *user_args)
                 pos++;
         }
     }
+    if (start < pos)
+        alias_add_word (&res, &length_res, start);
+    
     if (argv)
         free_exploded_string (argv);
     return res;