diff --git a/ChangeLog b/ChangeLog
index f5b1e42e..a0f640cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-10  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Added --bt-save-metadata option to -i list options.
+	* doc/aria2c.1.txt
+	* src/download_helper.cc
+
 2010-01-09  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Fixed compile error with i586-mingw32msvc-gcc 4.4.2, without any
diff --git a/doc/aria2c.1 b/doc/aria2c.1
index df062abb..8aced39a 100644
--- a/doc/aria2c.1
+++ b/doc/aria2c.1
@@ -2,12 +2,12 @@
 .\"     Title: aria2c
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 01/07/2010
+.\"      Date: 01/10/2010
 .\"    Manual: Aria2 Manual
 .\"    Source: Aria2
 .\"  Language: English
 .\"
-.TH "ARIA2C" "1" "01/07/2010" "Aria2" "Aria2 Manual"
+.TH "ARIA2C" "1" "01/10/2010" "Aria2" "Aria2 Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1760,6 +1760,17 @@ bt\-request\-peer\-speed\-limit
 .sp -1
 .IP \(bu 2.3
 .\}
+bt\-save\-metadata
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 bt\-seed\-unverified
 .RE
 .sp
diff --git a/doc/aria2c.1.html b/doc/aria2c.1.html
index ca59109d..2e476e99 100644
--- a/doc/aria2c.1.html
+++ b/doc/aria2c.1.html
@@ -2402,6 +2402,11 @@ bt-request-peer-speed-limit
 </li>
 <li>
 <p>
+bt-save-metadata
+</p>
+</li>
+<li>
+<p>
 bt-seed-unverified
 </p>
 </li>
@@ -3540,7 +3545,7 @@ files in the program, then also delete it here.</p></div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2010-01-07 21:32:34 JST
+Last updated 2010-01-10 15:46:41 JST
 </div>
 </div>
 </body>
diff --git a/doc/aria2c.1.txt b/doc/aria2c.1.txt
index 51482712..318c0663 100644
--- a/doc/aria2c.1.txt
+++ b/doc/aria2c.1.txt
@@ -990,6 +990,7 @@ of URIs. These optional lines must start with white space(s).
 * bt-prioritize-piece
 * bt-require-crypto
 * bt-request-peer-speed-limit
+* bt-save-metadata
 * bt-seed-unverified
 * bt-stop-timeout
 * bt-tracker-interval
diff --git a/src/download_helper.cc b/src/download_helper.cc
index 28a7579b..246c2f87 100644
--- a/src/download_helper.cc
+++ b/src/download_helper.cc
@@ -115,6 +115,7 @@ const std::set<std::string>& listRequestOptions()
     PREF_BT_PRIORITIZE_PIECE,
     PREF_BT_REQUIRE_CRYPTO,
     PREF_BT_REQUEST_PEER_SPEED_LIMIT,
+    PREF_BT_SAVE_METADATA,
     PREF_BT_SEED_UNVERIFIED,
     PREF_BT_STOP_TIMEOUT,
     PREF_BT_TRACKER_INTERVAL,