diff --git a/ChangeLog b/ChangeLog
index 8504c06b..02f174dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-16  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Made the max value of split option unlimited.
+	* doc/aria2c.1.txt
+	* src/OptionHandlerFactory.cc
+
 2009-01-16  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Fixed compile warning/error.
diff --git a/doc/aria2c.1 b/doc/aria2c.1
index 74dac5c7..3c1f6ab2 100644
--- a/doc/aria2c.1
+++ b/doc/aria2c.1
@@ -1,11 +1,11 @@
 .\"     Title: aria2c
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
-.\"      Date: 12/29/2008
+.\"      Date: 01/16/2009
 .\"    Manual: 
 .\"    Source: 
 .\"
-.TH "ARIA2C" "1" "12/29/2008" "" ""
+.TH "ARIA2C" "1" "01/16/2009" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -193,10 +193,7 @@ Specifies timeout in seconds to invalidate performance profile of the servers si
 .PP
 \fB\-s\fR, \fB\-\-split\fR=N
 .RS 4
-Download a file using N connections\&. If more than N URLs are given, first N URLs are used and remaining URLs are used for backup\&. If less than N URLs are given, those URLs are used more than once so that N connections total are made simultaneously\&. N must be between
-\fI1\fR
-and
-\fI16\fR\&. Please see
+Download a file using N connections\&. If more than N URLs are given, first N URLs are used and remaining URLs are used for backup\&. If less than N URLs are given, those URLs are used more than once so that N connections total are made simultaneously\&. Please see
 \fB\-j\fR
 option too\&. Please note that in Metalink download, this option has no effect and use
 \fB\-C\fR
diff --git a/doc/aria2c.1.html b/doc/aria2c.1.html
index 940d06d1..282dc5c9 100644
--- a/doc/aria2c.1.html
+++ b/doc/aria2c.1.html
@@ -622,7 +622,7 @@ aria2c -o myfile.zip http://mirror1/file.zip http://mirror2/file.zip</td>
   used for backup.
   If less than N URLs are given, those URLs are used more than once so that N
   connections total are made simultaneously.
-  N must be between <em>1</em> and <em>16</em>. Please see <strong>-j</strong> option too.
+  Please see <strong>-j</strong> option too.
   Please note that in Metalink download, this option has no effect and use
   <strong>-C</strong> option instead.
   Default: <em>5</em>
@@ -2064,7 +2064,7 @@ files in the program, then also delete it here.</p></div>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2008-12-29 23:10:06 JST
+Last updated 2009-01-16 00:36:39 JST
 </div>
 </div>
 </body>
diff --git a/doc/aria2c.1.txt b/doc/aria2c.1.txt
index fed50f88..640d5478 100644
--- a/doc/aria2c.1.txt
+++ b/doc/aria2c.1.txt
@@ -146,7 +146,7 @@ aria2c -o myfile.zip \http://mirror1/file.zip \http://mirror2/file.zip
   used for backup.
   If less than N URLs are given, those URLs are used more than once so that N
   connections total are made simultaneously.
-  N must be between '1' and '16'. Please see *-j* option too.
+  Please see *-j* option too.
   Please note that in Metalink download, this option has no effect and use
   *-C* option instead.
   Default: '5'
diff --git a/src/OptionHandlerFactory.cc b/src/OptionHandlerFactory.cc
index a7ee3ac7..7d5ba5d9 100644
--- a/src/OptionHandlerFactory.cc
+++ b/src/OptionHandlerFactory.cc
@@ -411,7 +411,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
 				   (PREF_SPLIT,
 				    TEXT_SPLIT,
 				    "5",
-				    1, 16));
+				    1));
     op->addTag(TAG_BASIC);
     op->addTag(TAG_FTP);
     op->addTag(TAG_HTTP);