diff --git a/ChangeLog b/ChangeLog
index 8aff4f3c..c42aea83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-25  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+	Changed the default value of PREF_PEER_CONNECTION_TIMEOUT and
+	lowestSpeedLimit in ActivePeerConnectionCommand. TODO: Make them
+	command-line options.
+	* src/option_processing.cc
+	* src/ActivePeerConnectionCommand.cc
+
 2007-12-25  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Send have message to peer if it already has the piece.
diff --git a/src/ActivePeerConnectionCommand.cc b/src/ActivePeerConnectionCommand.cc
index 27c0798d..ef7e1a32 100644
--- a/src/ActivePeerConnectionCommand.cc
+++ b/src/ActivePeerConnectionCommand.cc
@@ -47,7 +47,7 @@ ActivePeerConnectionCommand::ActivePeerConnectionCommand(int cuid,
    RequestGroupAware(requestGroup),
    interval(interval),
    e(e),
-   _lowestSpeedLimit(20*1024),
+   _lowestSpeedLimit(50*1024),
    _numNewConnection(5)
 {}
 
diff --git a/src/option_processing.cc b/src/option_processing.cc
index b0beaa12..05ec2e69 100644
--- a/src/option_processing.cc
+++ b/src/option_processing.cc
@@ -91,7 +91,7 @@ Option* option_processing(int argc, char* const argv[])
   op->put(PREF_RETRY_WAIT, "5");
   op->put(PREF_TIMEOUT, "60");
   op->put(PREF_DNS_TIMEOUT, "10");
-  op->put(PREF_PEER_CONNECTION_TIMEOUT, "60");
+  op->put(PREF_PEER_CONNECTION_TIMEOUT, "20");
   op->put(PREF_BT_TIMEOUT, "180");
   op->put(PREF_BT_REQUEST_TIMEOUT, "60");
   op->put(PREF_BT_KEEP_ALIVE_INTERVAL, "120");