diff --git a/ChangeLog b/ChangeLog
index 2acf66cc..91ab6199 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-11  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Added short option -k for --min-split-size option and -x for
+	--max-connection-per-server option. Raised maximum value of
+	--max-connection-per-server up to 16.
+	* src/OptionHandlerFactory.cc
+	* src/usage_text.h
+
 2010-09-11  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Use uri::parse instead of Request::setUri() where just URI parser
diff --git a/src/OptionHandlerFactory.cc b/src/OptionHandlerFactory.cc
index 5c0b80e5..e7f34a13 100644
--- a/src/OptionHandlerFactory.cc
+++ b/src/OptionHandlerFactory.cc
@@ -350,7 +350,8 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
                                    (PREF_MAX_CONNECTION_PER_SERVER,
                                     TEXT_MAX_CONNECTION_PER_SERVER,
                                     "1",
-                                    1, 4));
+                                    1, 16,
+                                    'x'));
     op->addTag(TAG_ADVANCED);
     handlers.push_back(op);
   }
@@ -401,7 +402,8 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
                                    (PREF_MIN_SPLIT_SIZE,
                                     TEXT_MIN_SPLIT_SIZE,
                                     "20M",
-                                    1024*1024, 1024*1024*1024));
+                                    1024*1024, 1024*1024*1024,
+                                    'k'));
     op->addTag(TAG_ADVANCED);
     op->addTag(TAG_FTP);
     op->addTag(TAG_HTTP);
diff --git a/src/usage_text.h b/src/usage_text.h
index 14a76a01..eaa7acbb 100644
--- a/src/usage_text.h
+++ b/src/usage_text.h
@@ -687,10 +687,10 @@
     "                              added by aria2.addTorrent and aria2.addMetalink\n" \
     "                              XML-RPC method are not saved.")
 #define TEXT_MAX_CONNECTION_PER_SERVER          \
-  _(" --max-connection-per-server=NUM The maximum number of connections to one server\n"\
-    "                              for each download.")
+  _(" -x, --max-connection-per-server=NUM The maximum number of connections to one\n" \
+    "                              server for each download.")
 #define TEXT_MIN_SPLIT_SIZE                     \
-  _(" --min-split-size=SIZE        aria2 does not split less than 2*SIZE byte range.\n" \
+  _(" -k, --min-split-size=SIZE    aria2 does not split less than 2*SIZE byte range.\n" \
     "                              For example, let's consider downloading 20MiB\n" \
     "                              file. If SIZE is 10M, aria2 can split file into 2\n" \
     "                              range [0-10MiB) and [10MiB-20MiB) and download it\n" \