diff --git a/ChangeLog b/ChangeLog
index 218d428a..5360782a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-27  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Added bt-tracker and bt-exclude-tracker to -i list option.
+	* doc/aria2c.1.txt
+	* doc/xmlrpc/aria2rpc
+	* src/download_helper.cc
+
 2010-08-27  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Don't listen on IPv6 socket for BitTorrent, DHT, XML-RPC if
diff --git a/doc/aria2c.1 b/doc/aria2c.1
index 783c2514..11029d91 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: 08/25/2010
+.\"      Date: 08/27/2010
 .\"    Manual: Aria2 Manual
 .\"    Source: Aria2 1.10.1
 .\"  Language: English
 .\"
-.TH "ARIA2C" "1" "08/25/2010" "Aria2 1\&.10\&.1" "Aria2 Manual"
+.TH "ARIA2C" "1" "08/27/2010" "Aria2 1\&.10\&.1" "Aria2 Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -2673,6 +2673,28 @@ conditional\-get
 enable\-async\-dns6
 .RE
 .sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+bt\-tracker
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+bt\-exclude\-tracker
+.RE
+.sp
 These options have exactly same meaning of the ones in the command\-line options, but it just applies to the URIs it belongs to\&.
 .sp
 For example, the content of uri\&.txt is
diff --git a/doc/aria2c.1.html b/doc/aria2c.1.html
index 8be41c02..d1f2a333 100644
--- a/doc/aria2c.1.html
+++ b/doc/aria2c.1.html
@@ -3078,6 +3078,16 @@ conditional-get
 enable-async-dns6
 </p>
 </li>
+<li>
+<p>
+bt-tracker
+</p>
+</li>
+<li>
+<p>
+bt-exclude-tracker
+</p>
+</li>
 </ul></div>
 <div class="paragraph"><p>These options have exactly same meaning of the ones in the
 command-line options, but it just applies to the URIs it belongs to.</p></div>
@@ -4354,7 +4364,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-08-25 23:25:37 JST
+Last updated 2010-08-27 20:49:24 JST
 </div>
 </div>
 </body>
diff --git a/doc/aria2c.1.txt b/doc/aria2c.1.txt
index e08a8e5b..f3fa7bce 100644
--- a/doc/aria2c.1.txt
+++ b/doc/aria2c.1.txt
@@ -1309,6 +1309,8 @@ of URIs. These optional lines must start with white space(s).
 * min-split-size
 * conditional-get
 * enable-async-dns6
+* bt-tracker
+* bt-exclude-tracker
 
 These options have exactly same meaning of the ones in the
 command-line options, but it just applies to the URIs it belongs to.
diff --git a/doc/xmlrpc/aria2rpc b/doc/xmlrpc/aria2rpc
index 2ba48d22..b31b4261 100755
--- a/doc/xmlrpc/aria2rpc
+++ b/doc/xmlrpc/aria2rpc
@@ -206,6 +206,12 @@ OptionParser.new do |opt|
   opt.on("--conditional-get [BOOL]",["true","false"]){|val|
     options["conditional-get"]=val||"true"
   }
+  opt.on("--enable-async-dns6 [BOOL]",["true","false"]){|val|
+    options["enable-async-dns6"]=val||"true"
+  }
+  opt.on("--bt-tracker URIS"){|val| options["bt-tracker"]=val}
+  opt.on("--bt-exclude-tracker URIS"){|val| options["bt-exclude-tracker"]=val}
+
   opt.on("--max-overall-download-limit LIMIT"){|val| options["max-overall-download-limit"]=val}
   opt.on("--max-overall-upload-limit LIMIT"){|val| options["max-overall-upload-limit"]=val}
   opt.on("-j","--max-concurrent-downloads N"){|val| options["max-concurrent-downloads"]=val}
diff --git a/src/download_helper.cc b/src/download_helper.cc
index d614ccce..02eca05b 100644
--- a/src/download_helper.cc
+++ b/src/download_helper.cc
@@ -163,7 +163,9 @@ const std::set<std::string>& listRequestOptions()
     PREF_MAX_CONNECTION_PER_SERVER,
     PREF_MIN_SPLIT_SIZE,
     PREF_CONDITIONAL_GET,
-    PREF_ENABLE_ASYNC_DNS6
+    PREF_ENABLE_ASYNC_DNS6,
+    PREF_BT_TRACKER,
+    PREF_BT_EXCLUDE_TRACKER
   };
   static std::set<std::string> requestOptions
     (vbegin(REQUEST_OPTIONS), vend(REQUEST_OPTIONS));