diff --git a/src/ChangeLog b/src/ChangeLog
index 40321365..57146d70 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-18  Mauro Tortonesi <mauro@ferrara.linux.it>
+
+	* main.c: Added the --ftp-passwd command line option.
+
+	* init.c: Renamed command passwd to ftppasswd.
+
 2005-02-11  Mauro Tortonesi <mauro@ferrara.linux.it>
 	
 	* string_t.c: Fixed a bug in do_escape and triggered escape of
diff --git a/src/init.c b/src/init.c
index 1096de02..1aaa13e9 100644
--- a/src/init.c
+++ b/src/init.c
@@ -143,6 +143,7 @@ static struct {
   { "followftp",	&opt.follow_ftp,	cmd_boolean },
   { "followtags",	&opt.follow_tags,	cmd_vector },
   { "forcehtml",	&opt.force_html,	cmd_boolean },
+  { "ftppasswd",	&opt.ftp_pass,		cmd_string },
   { "ftpproxy",		&opt.ftp_proxy,		cmd_string },
   { "glob",		&opt.ftp_glob,		cmd_boolean },
   { "header",		&opt.user_headers,	cmd_spec_header },
@@ -176,7 +177,6 @@ static struct {
   { "outputdocument",	&opt.output_document,	cmd_file },
   { "pagerequisites",	&opt.page_requisites,	cmd_boolean },
   { "passiveftp",	&opt.ftp_pasv,		cmd_lockable_boolean },
-  { "passwd",		&opt.ftp_pass,		cmd_string },
   { "postdata",		&opt.post_data,		cmd_string },
   { "postfile",		&opt.post_file_name,	cmd_file },
   { "preservepermissions", &opt.preserve_perm,	cmd_boolean },
diff --git a/src/main.c b/src/main.c
index 2facb8bd..f9827dd8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -182,6 +182,7 @@ struct cmdline_option option_data[] =
     { "follow-tags", 0, OPT_VALUE, "followtags", -1 },
     { "force-directories", 'x', OPT_BOOLEAN, "dirstruct", -1 },
     { "force-html", 'F', OPT_BOOLEAN, "forcehtml", -1 },
+    { "ftp-passwd", 0, OPT_VALUE, "ftppasswd", -1 },
     { "glob", 0, OPT_BOOLEAN, "glob", -1 },
     { "header", 0, OPT_VALUE, "header", -1 },
     { "help", 'h', OPT_FUNCALL, (void *)print_help, no_argument },