diff --git a/ChangeLog b/ChangeLog
index 3a54dbff..a85759bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2009-05-15  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Added changeGlobalOption command. Currently,
+	max-overall-download-limit and max-overall-upload-limit option are
+	available.
+	* src/RequestGroupMan.h
+	* src/XmlRpcMethod.cc
+	* src/XmlRpcMethod.h
+	* src/XmlRpcMethodFactory.cc
+	* src/XmlRpcMethodImpl.cc
+	* src/XmlRpcMethodImpl.h
+	* test/XmlRpcMethodTest.cc
+
 2009-05-15  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Added changeOption command. Currently, max-download-limit,
diff --git a/src/RequestGroupMan.h b/src/RequestGroupMan.h
index 2c2629f3..d181fb5d 100644
--- a/src/RequestGroupMan.h
+++ b/src/RequestGroupMan.h
@@ -193,10 +193,30 @@ public:
   // _maxOverallDownloadSpeedLimit == 0.  Otherwise returns false.
   bool doesOverallDownloadSpeedExceed();
 
+  void setMaxOverallDownloadSpeedLimit(unsigned int speed)
+  {
+    _maxOverallDownloadSpeedLimit = speed;
+  }
+
+  unsigned int getMaxOverallDownloadSpeedLimit() const
+  {
+    return _maxOverallDownloadSpeedLimit;
+  }
+
   // Returns true if current upload speed exceeds
   // _maxOverallUploadSpeedLimit. Always returns false if
   // _maxOverallUploadSpeedLimit == 0. Otherwise returns false.
   bool doesOverallUploadSpeedExceed();
+
+  void setMaxOverallUploadSpeedLimit(unsigned int speed)
+  {
+    _maxOverallUploadSpeedLimit = speed;
+  }
+
+  unsigned int getMaxOverallUploadSpeedLimit() const
+  {
+    return _maxOverallUploadSpeedLimit;
+  }
 };
 
 typedef SharedHandle<RequestGroupMan> RequestGroupManHandle;
diff --git a/src/XmlRpcMethod.cc b/src/XmlRpcMethod.cc
index 145dc9a1..5200933f 100644
--- a/src/XmlRpcMethod.cc
+++ b/src/XmlRpcMethod.cc
@@ -115,7 +115,7 @@ const std::vector<std::string>& listChangeableOptions()
     PREF_MAX_DOWNLOAD_LIMIT,
   };
   static std::vector<std::string> options
-    (&OPTIONS[0], &OPTIONS[arrayLength(OPTIONS)]);;
+    (&OPTIONS[0], &OPTIONS[arrayLength(OPTIONS)]);
   return options;
 }
 
@@ -126,6 +126,25 @@ void XmlRpcMethod::gatherChangeableOption
 	       option, optionsDict, _optionParser);
 }
 
+const std::vector<std::string>& listChangeableGlobalOptions()
+{
+  static const std::string OPTIONS[] = {
+    PREF_MAX_OVERALL_UPLOAD_LIMIT,
+    PREF_MAX_OVERALL_DOWNLOAD_LIMIT,
+  };
+  static std::vector<std::string> options
+    (&OPTIONS[0], &OPTIONS[arrayLength(OPTIONS)]);
+  return options;
+}
+
+void XmlRpcMethod::gatherChangeableGlobalOption
+(const SharedHandle<Option>& option, const BDE& optionsDict)
+{
+  gatherOption(listChangeableGlobalOptions().begin(),
+	       listChangeableGlobalOptions().end(),
+	       option, optionsDict, _optionParser);
+}
+
 } // namespace xmlrpc
 
 } // namespace aria2
diff --git a/src/XmlRpcMethod.h b/src/XmlRpcMethod.h
index 51f61723..9af6023b 100644
--- a/src/XmlRpcMethod.h
+++ b/src/XmlRpcMethod.h
@@ -67,6 +67,9 @@ protected:
 
   void gatherChangeableOption(const SharedHandle<Option>& option,
 			      const BDE& optionDict);
+
+  void gatherChangeableGlobalOption(const SharedHandle<Option>& option,
+				    const BDE& optionDict);
 public:
   XmlRpcMethod();
 
diff --git a/src/XmlRpcMethodFactory.cc b/src/XmlRpcMethodFactory.cc
index 5b1de65c..ac9fa57b 100644
--- a/src/XmlRpcMethodFactory.cc
+++ b/src/XmlRpcMethodFactory.cc
@@ -64,6 +64,8 @@ XmlRpcMethodFactory::create(const std::string& methodName)
     return SharedHandle<XmlRpcMethod>(new TellActiveXmlRpcMethod());
   } else if(methodName == "aria2.changeOption") {
     return SharedHandle<XmlRpcMethod>(new ChangeOptionXmlRpcMethod());
+  } else if(methodName == "aria2.changeGlobalOption") {
+    return SharedHandle<XmlRpcMethod>(new ChangeGlobalOptionXmlRpcMethod());
   } else if(methodName == "aria2.purgeDownloadResult") {
     return SharedHandle<XmlRpcMethod>(new PurgeDownloadResultXmlRpcMethod());
   } else {
diff --git a/src/XmlRpcMethodImpl.cc b/src/XmlRpcMethodImpl.cc
index cb6ccfff..8c823bc3 100644
--- a/src/XmlRpcMethodImpl.cc
+++ b/src/XmlRpcMethodImpl.cc
@@ -488,6 +488,27 @@ BDE ChangeOptionXmlRpcMethod::process
   return BDE("OK");
 }
 
+BDE ChangeGlobalOptionXmlRpcMethod::process
+(const XmlRpcRequest& req, DownloadEngine* e)
+{
+  const BDE& params = req._params;
+  assert(params.isList());
+  if(params.empty() || !params[0].isDict()) {
+    return BDE("OK");
+  }
+  SharedHandle<Option> option(new Option(*e->option));
+  gatherChangeableGlobalOption(option, params[0]);
+  if(option->defined(PREF_MAX_OVERALL_DOWNLOAD_LIMIT)) {
+    e->_requestGroupMan->setMaxOverallDownloadSpeedLimit
+      (option->getAsInt(PREF_MAX_OVERALL_DOWNLOAD_LIMIT));
+  }
+  if(option->defined(PREF_MAX_OVERALL_UPLOAD_LIMIT)) {
+    e->_requestGroupMan->setMaxOverallUploadSpeedLimit
+      (option->getAsInt(PREF_MAX_OVERALL_UPLOAD_LIMIT));
+  }
+  return BDE("OK");
+}
+
 BDE NoSuchMethodXmlRpcMethod::process
 (const XmlRpcRequest& req, DownloadEngine* e)
 {
diff --git a/src/XmlRpcMethodImpl.h b/src/XmlRpcMethodImpl.h
index 6d25b390..05d53dc0 100644
--- a/src/XmlRpcMethodImpl.h
+++ b/src/XmlRpcMethodImpl.h
@@ -96,6 +96,11 @@ protected:
   virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
 };
 
+class ChangeGlobalOptionXmlRpcMethod:public XmlRpcMethod {
+protected:
+  virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
+};
+
 class NoSuchMethodXmlRpcMethod:public XmlRpcMethod {
 protected:
   virtual BDE process(const XmlRpcRequest& req, DownloadEngine* e);
diff --git a/test/XmlRpcMethodTest.cc b/test/XmlRpcMethodTest.cc
index 171294a4..0de9d207 100644
--- a/test/XmlRpcMethodTest.cc
+++ b/test/XmlRpcMethodTest.cc
@@ -25,6 +25,7 @@ class XmlRpcMethodTest:public CppUnit::TestFixture {
   CPPUNIT_TEST_SUITE(XmlRpcMethodTest);
   CPPUNIT_TEST(testAddUri);
   CPPUNIT_TEST(testChangeOption);
+  CPPUNIT_TEST(testChangeGlobalOption);
   CPPUNIT_TEST(testNoSuchMethod);
   CPPUNIT_TEST_SUITE_END();
 private:
@@ -46,6 +47,7 @@ public:
 
   void testAddUri();
   void testChangeOption();
+  void testChangeGlobalOption();
   void testNoSuchMethod();
 };
 
@@ -88,6 +90,23 @@ void XmlRpcMethodTest::testChangeOption()
   CPPUNIT_ASSERT_EQUAL((unsigned int)50*1024, group->getMaxUploadSpeedLimit());
 }
 
+void XmlRpcMethodTest::testChangeGlobalOption()
+{
+  ChangeGlobalOptionXmlRpcMethod m;
+  XmlRpcRequest req("aria2.changeGlobalOption", BDE::list());
+  BDE opt = BDE::dict();
+  opt[PREF_MAX_OVERALL_DOWNLOAD_LIMIT] = BDE("100K");
+  opt[PREF_MAX_OVERALL_UPLOAD_LIMIT] = BDE("50K");
+  req._params << opt;
+  XmlRpcResponse res = m.execute(req, _e.get());
+
+  CPPUNIT_ASSERT_EQUAL(0, res._code);
+  CPPUNIT_ASSERT_EQUAL((unsigned int)100*1024,
+		       _e->_requestGroupMan->getMaxOverallDownloadSpeedLimit());
+  CPPUNIT_ASSERT_EQUAL((unsigned int)50*1024,
+		       _e->_requestGroupMan->getMaxOverallUploadSpeedLimit());
+}
+
 void XmlRpcMethodTest::testNoSuchMethod()
 {
   NoSuchMethodXmlRpcMethod m;