diff --git a/ChangeLog b/ChangeLog
index 5a294510..61970324 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-19  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Added max-connection-per-server, min-split-size and
+	conditional-get option to -i list option and aria2rpc.
+	* doc/aria2c.1.txt
+	* doc/xmlrpc/aria2rpc
+	* src/download_helper.cc
+
 2010-07-19  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Fixed double free bug
diff --git a/doc/aria2c.1 b/doc/aria2c.1
index 6dd12208..a955cadc 100644
--- a/doc/aria2c.1
+++ b/doc/aria2c.1
@@ -2576,6 +2576,39 @@ max\-resume\-failure\-tries
 http\-accept\-gzip
 .RE
 .sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+max\-connection\-per\-server
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+min\-split\-size
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+conditional\-get
+.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 2069f0e3..8abcf9f9 100644
--- a/doc/aria2c.1.html
+++ b/doc/aria2c.1.html
@@ -2987,6 +2987,21 @@ max-resume-failure-tries
 http-accept-gzip
 </p>
 </li>
+<li>
+<p>
+max-connection-per-server
+</p>
+</li>
+<li>
+<p>
+min-split-size
+</p>
+</li>
+<li>
+<p>
+conditional-get
+</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>
@@ -4242,7 +4257,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-07-19 00:15:05 JST
+Last updated 2010-07-19 13:44:22 JST
 </div>
 </div>
 </body>
diff --git a/doc/aria2c.1.txt b/doc/aria2c.1.txt
index ff2bb2d8..62095c78 100644
--- a/doc/aria2c.1.txt
+++ b/doc/aria2c.1.txt
@@ -1261,6 +1261,9 @@ of URIs. These optional lines must start with white space(s).
 * always-resume
 * max-resume-failure-tries
 * http-accept-gzip
+* max-connection-per-server
+* min-split-size
+* conditional-get
 
 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 514197f7..2ba48d22 100755
--- a/doc/xmlrpc/aria2rpc
+++ b/doc/xmlrpc/aria2rpc
@@ -201,6 +201,11 @@ OptionParser.new do |opt|
   opt.on("--http-accept-gzip [BOOL]",["true","false"]){|val|
     options["http-accept-gzip"]=val||"true"
   }
+  opt.on("--max-connection-per-server NUM"){|val| options["max-connection-per-server"]=val}
+  opt.on("--min-split-size SIZE"){|val| options["min-split-size"]=val}
+  opt.on("--conditional-get [BOOL]",["true","false"]){|val|
+    options["conditional-get"]=val||"true"
+  }
   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 627fec05..0f85f6db 100644
--- a/src/download_helper.cc
+++ b/src/download_helper.cc
@@ -159,7 +159,10 @@ const std::set<std::string>& listRequestOptions()
     PREF_REMOVE_CONTROL_FILE,
     PREF_ALWAYS_RESUME,
     PREF_MAX_RESUME_FAILURE_TRIES,
-    PREF_HTTP_ACCEPT_GZIP
+    PREF_HTTP_ACCEPT_GZIP,
+    PREF_MAX_CONNECTION_PER_SERVER,
+    PREF_MIN_SPLIT_SIZE,
+    PREF_CONDITIONAL_GET
   };
   static std::set<std::string> requestOptions
     (vbegin(REQUEST_OPTIONS), vend(REQUEST_OPTIONS));