diff --git a/ChangeLog b/ChangeLog
index 610b1eb1..257bc34d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-25 Tatsuhiro Tsujikawa
+
+ Documented --bt-tracker and --bt-exclude-tracker option in man
+ page.
+ * doc/aria2c.1.txt
+
2010-08-25 Tatsuhiro Tsujikawa
Set max outstanding request size to 100. Set stepping to 6.
diff --git a/doc/aria2c.1 b/doc/aria2c.1
index dbdc1f34..f191b478 100644
--- a/doc/aria2c.1
+++ b/doc/aria2c.1
@@ -620,6 +620,13 @@ is given\&. Default:
\fIfalse\fR
.RE
.PP
+\fB\-\-bt\-exclude\-tracker\fR=URI[,\&...]
+.RS 4
+Comma separated list of BitTorrent tracker\(cqs announce URI to remove\&. You can use special value "*" which matches all URIs, thus removes all announce URIs\&. When specifying "*" in shell command\-line, don\(cqt forget to escape or quote it\&. See also
+\fB\-\-bt\-tracker\fR
+option\&.
+.RE
+.PP
\fB\-\-bt\-external\-ip\fR=IPADDRESS
.RS 4
Specify the external IP address to report to a BitTorrent tracker\&. Although this function is named "external", it can accept any kind of IP addresses\&. IPADDRESS must be a numeric IP address\&.
@@ -721,6 +728,15 @@ is given, this feature is disabled\&. Default:
\fI0\fR
.RE
.PP
+\fB\-\-bt\-tracker\fR=URI[,\&...]
+.RS 4
+Comma separated list of additional BitTorrent tracker\(cqs announce URI\&. These URIs are not affected by
+\fB\-\-bt\-exclude\-tracker\fR
+option because they are added after URIs in
+\fB\-\-bt\-exclude\-tracker\fR
+option are removed\&.
+.RE
+.PP
\fB\-\-bt\-tracker\-connect\-timeout\fR=SEC
.RS 4
Set the connect timeout in seconds to establish connection to tracker\&. After the connection is established, this option makes no effect and
@@ -3954,6 +3970,27 @@ If aria2c is not built with c\-ares, \fB\-\-enable\-async\-dns6\fR is unnecessar
.sp .5v
.RE
.RE
+.sp
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBAdd and remove tracker URI\fR
+.RS 4
+.sp
+Removes all tracker announce URIs described in file\&.torrent and use http://tracker1/announce and http://tracker2/announce instead\&.
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+aria2c \-\-bt\-exclude\-tracker="*" \-\-bt\-tracker="http://tracker1/announce,http://tracker2/announce" file\&.torrent
+.fi
+.if n \{\
+.RE
+.\}
+.RE
.SS "More advanced HTTP features"
.sp
.it 1 an-trap
diff --git a/doc/aria2c.1.html b/doc/aria2c.1.html
index 4bce631c..49727bbf 100644
--- a/doc/aria2c.1.html
+++ b/doc/aria2c.1.html
@@ -1321,6 +1321,18 @@ writes the piece to the appropriate files.
+--bt-exclude-tracker=URI[,…]
+
+
+
+ Comma separated list of BitTorrent tracker’s announce URI to
+ remove. You can use special value "*" which matches all URIs, thus
+ removes all announce URIs. When specifying "*" in shell
+ command-line, don’t forget to escape or quote it. See also
+ --bt-tracker option.
+
+
+
--bt-external-ip=IPADDRESS
@@ -1464,6 +1476,17 @@ writes the piece to the appropriate files.
+--bt-tracker=URI[,…]
+
+
+
+ Comma separated list of additional BitTorrent tracker’s announce
+ URI. These URIs are not affected by --bt-exclude-tracker option
+ because they are added after URIs in --bt-exclude-tracker option are
+ removed.
+
+
+
--bt-tracker-connect-timeout=SEC
@@ -4187,6 +4210,13 @@ forwarding, it’s up to you to do it manually.
unnecessary. aria2 shares same port between IPv4 and IPv6 DHT.
+Add and remove tracker URI
+
+
+
+
aria2c --bt-exclude-tracker="*" --bt-tracker="http://tracker1/announce,http://tracker2/announce" file.torrent
+
More advanced HTTP features
Load cookies
@@ -4324,7 +4354,7 @@ files in the program, then also delete it here.