diff --git a/ChangeLog b/ChangeLog
index 47bc6166..f52616ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-10  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+	Updated command-line usage text, so that it tells users that they
+	can specify any number of torrent files and metalink files in
+	command-line.
+	* src/version_usage.cc
+
 2008-05-09  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Changed the default value of -j option to 1.
diff --git a/src/version_usage.cc b/src/version_usage.cc
index 5fd48096..e450e075 100644
--- a/src/version_usage.cc
+++ b/src/version_usage.cc
@@ -74,13 +74,7 @@ void showVersion() {
 }
 
 void showUsage(const std::string& category, const Option* option) {
-  std::cout << StringFormat(_("Usage: %s [options] URL ...\n"), PACKAGE_NAME)
-#ifdef ENABLE_BITTORRENT
-	    << StringFormat(_("       %s [options] -T TORRENT_FILE URL ...\n"), PACKAGE_NAME)
-#endif // ENABLE_BITTORRENT
-#ifdef ENABLE_METALINK
-	    << StringFormat(_("       %s [options] -M METALINK_FILE\n"), PACKAGE_NAME)
-#endif // ENABLE_METALINK
+  std::cout << StringFormat(_("Usage: %s [options] URL|TORRENT_FILE|METALINK_FILE ...\n"), PACKAGE_NAME)
 	    << "\n";
 
   SharedHandle<TagContainer> tc = HelpItemFactory::createHelpItems(option);
@@ -116,9 +110,14 @@ void showUsage(const std::string& category, const Option* option) {
   }
   if(category == TAG_BASIC) {
     std::cout << "\n"
-	      << "URL:" << "\n"
+	      << "URL, TORRENT_FILE, METALINK_FILE:" << "\n"
 	      << _(" You can specify multiple URLs. Unless you specify -Z option, all URLs must\n"
 		   " point to the same file or downloading will fail.") << "\n"
+	      << _(" You can also specify arbitrary number of torrent files and metalink files\n"
+		   " stored in a local drive. Please note that they are always treated as a\n"
+		   " separate download.") << "\n"
+
+	      << "\n"
 	      << _(" You can specify both torrent file with -T option and URLs. By doing this,\n"
 		   " download a file from both torrent swarm and http/ftp server at the same time,\n"
 		   " while the data from http/ftp are uploaded to the torrent swarm. Note that\n"