diff --git a/ChangeLog b/ChangeLog
index 69d39617..2215f2f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-05  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Added bt-stop-timeout option to -i list.
+	* doc/aria2c.1.txt
+	* src/download_helper.cc
+
 2009-07-05  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Fixed typo
diff --git a/doc/aria2c.1 b/doc/aria2c.1
index b98fc5af..e7b0ce59 100644
--- a/doc/aria2c.1
+++ b/doc/aria2c.1
@@ -536,7 +536,7 @@ Seed previously downloaded files without verifying piece hashes\&. Default:
 \fIfalse\fR
 .RE
 .PP
-\fB\-\-bt\-stop\-timteout\fR=SEC
+\fB\-\-bt\-stop\-timeout\fR=SEC
 .RS 4
 Stop BitTorrent download if download speed is 0 and the number of seeder is 0 in consecutive NUM seconds\&. If
 \fI0\fR
@@ -1711,6 +1711,17 @@ bt\-seed\-unverified
 .sp -1
 .IP \(bu 2.3
 .\}
+bt\-stop\-timeout
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 bt\-tracker\-interval
 .RE
 .sp
diff --git a/doc/aria2c.1.html b/doc/aria2c.1.html
index c2bb1b5a..3da58c1a 100644
--- a/doc/aria2c.1.html
+++ b/doc/aria2c.1.html
@@ -1099,7 +1099,7 @@ writes the piece to the appropriate files.</td>
 </p>
 </dd>
 <dt class="hdlist1">
-<strong>--bt-stop-timteout</strong>=SEC
+<strong>--bt-stop-timeout</strong>=SEC
 </dt>
 <dd>
 <p>
@@ -2180,6 +2180,11 @@ bt-seed-unverified
 </li>
 <li>
 <p>
+bt-stop-timeout
+</p>
+</li>
+<li>
+<p>
 bt-tracker-interval
 </p>
 </li>
@@ -3183,7 +3188,7 @@ files in the program, then also delete it here.</p></div>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2009-07-05 14:34:41 JST
+Last updated 2009-07-05 14:40:49 JST
 </div>
 </div>
 </body>
diff --git a/doc/aria2c.1.txt b/doc/aria2c.1.txt
index 8d755e44..e059bfa9 100644
--- a/doc/aria2c.1.txt
+++ b/doc/aria2c.1.txt
@@ -375,7 +375,7 @@ BitTorrent Specific Options
   Seed previously downloaded files without verifying piece hashes.
   Default: 'false'
 
-*--bt-stop-timteout*=SEC::
+*--bt-stop-timeout*=SEC::
 
   Stop BitTorrent download if download speed is 0 and the number of
   seeder is 0 in consecutive NUM seconds. If '0' is given, this
@@ -934,6 +934,7 @@ of URIs. These optional lines must start with white space(s).
 * bt-require-crypto
 * bt-request-peer-speed-limit
 * bt-seed-unverified
+* bt-stop-timeout
 * bt-tracker-interval
 * enable-peer-exchange
 * follow-torrent
diff --git a/src/download_helper.cc b/src/download_helper.cc
index dec5d7bb..9e2346d2 100644
--- a/src/download_helper.cc
+++ b/src/download_helper.cc
@@ -113,6 +113,7 @@ const std::vector<std::string>& listRequestOptions()
     PREF_BT_REQUIRE_CRYPTO,
     PREF_BT_REQUEST_PEER_SPEED_LIMIT,
     PREF_BT_SEED_UNVERIFIED,
+    PREF_BT_STOP_TIMEOUT,
     PREF_BT_TRACKER_INTERVAL,
     PREF_ENABLE_PEER_EXCHANGE,
     PREF_FOLLOW_TORRENT,