diff --git a/ChangeLog b/ChangeLog
index 29e4bbf4..fbc8f787 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-09  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Added more options that can be specified in -i list and xml-rpc
+	add* command.	
+	* src/download_helper.h
+	
 2009-05-09  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	The available options in -i list should be listed in
diff --git a/src/download_helper.cc b/src/download_helper.cc
index 929ed1a7..f67b7ca2 100644
--- a/src/download_helper.cc
+++ b/src/download_helper.cc
@@ -67,9 +67,75 @@ const std::vector<std::string>& listRequestOptions()
 {
   static const std::string REQUEST_OPTIONS[] = {
     PREF_DIR,
+    PREF_CHECK_INTEGRITY,
+    PREF_CONTINUE,
+    PREF_ALL_PROXY,
+    PREF_CONNECT_TIMEOUT,
+    PREF_DRY_RUN,
+    PREF_LOWEST_SPEED_LIMIT,
+    PREF_MAX_FILE_NOT_FOUND,
+    PREF_MAX_TRIES,
+    PREF_NO_PROXY,
     PREF_OUT,
+    PREF_PROXY_METHOD,
+    PREF_REMOTE_TIME,
+    PREF_RETRY_WAIT,
+    PREF_SPLIT,
+    PREF_TIMEOUT,
+    PREF_HTTP_AUTH_CHALLENGE,
+    PREF_HTTP_USER,
+    PREF_HTTP_PASSWD,
+    PREF_HTTP_PROXY,
+    PREF_HTTPS_PROXY,
+    PREF_REFERER,
+    PREF_ENABLE_HTTP_KEEP_ALIVE,
+    PREF_ENABLE_HTTP_PIPELINING,
+    PREF_HEADER,
+    PREF_USE_HEAD,
+    PREF_USER_AGENT,
+    PREF_FTP_USER,
+    PREF_FTP_PASSWD,
+    PREF_FTP_PASV,
+    PREF_FTP_PROXY,
+    PREF_FTP_TYPE,
+    PREF_FTP_REUSE_CONNECTION,
+    PREF_NO_NETRC,
     PREF_SELECT_FILE,
-    PREF_INDEX_OUT
+    PREF_BT_EXTERNAL_IP,
+    PREF_BT_HASH_CHECK_SEED,
+    PREF_BT_MAX_OPEN_FILES,
+    PREF_BT_MAX_PEERS,
+    PREF_BT_MIN_CRYPTO_LEVEL,
+    PREF_BT_REQUIRE_CRYPTO,
+    PREF_BT_REQUEST_PEER_SPEED_LIMIT,
+    PREF_BT_SEED_UNVERIFIED,
+    PREF_BT_TRACKER_INTERVAL,
+    PREF_ENABLE_PEER_EXCHANGE,
+    PREF_FOLLOW_TORRENT,
+    PREF_INDEX_OUT,
+    PREF_MAX_OVERALL_UPLOAD_LIMIT,
+    PREF_MAX_UPLOAD_LIMIT,
+    PREF_PEER_ID_PREFIX,
+    PREF_SEED_RATIO,
+    PREF_SEED_TIME,
+    PREF_FOLLOW_METALINK,
+    PREF_METALINK_SERVERS,
+    PREF_METALINK_LANGUAGE,
+    PREF_METALINK_LOCATION,
+    PREF_METALINK_OS,
+    PREF_METALINK_VERSION,
+    PREF_METALINK_PREFERRED_PROTOCOL,
+    PREF_METALINK_ENABLE_UNIQUE_PROTOCOL,
+    PREF_ALLOW_OVERWRITE,
+    PREF_ALLOW_PIECE_LENGTH_CHANGE,
+    PREF_ASYNC_DNS,
+    PREF_AUTO_FILE_RENAMING,
+    PREF_FILE_ALLOCATION,
+    PREF_MAX_OVERALL_DOWNLOAD_LIMIT,
+    PREF_MAX_DOWNLOAD_LIMIT,
+    PREF_NO_FILE_ALLOCATION_LIMIT,
+    PREF_PARAMETERIZED_URI,
+    PREF_REALTIME_CHUNK_CHECKSUM
   };
   static std::vector<std::string> requestOptions
     (&REQUEST_OPTIONS[0],