diff --git a/ChangeLog b/ChangeLog
index 7dadc961..793ab299 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-09-20  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Removed --retry-wait option since the current architecture doesn't
+	allow sleep for particular URI.
+	* src/AbstractCommand.cc
+	* src/OptionHandlerFactory.cc
+	* src/download_helper.cc
+	* src/prefs.cc
+	* src/prefs.h
+
 2009-09-20  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Removed Retry-After header support. Since the current architecture
diff --git a/src/AbstractCommand.cc b/src/AbstractCommand.cc
index afb96224..c7dff00d 100644
--- a/src/AbstractCommand.cc
+++ b/src/AbstractCommand.cc
@@ -219,7 +219,7 @@ bool AbstractCommand::execute() {
       tryReserved();
       return true;
     } else {
-      return prepareForRetry(getOption()->getAsInt(PREF_RETRY_WAIT));
+      return prepareForRetry(0);
     }
   } catch(DownloadFailureException& err) {
     logger->error(EX_EXCEPTION_CAUGHT, err);
diff --git a/src/OptionHandlerFactory.cc b/src/OptionHandlerFactory.cc
index 11c586e1..b47eabd4 100644
--- a/src/OptionHandlerFactory.cc
+++ b/src/OptionHandlerFactory.cc
@@ -533,16 +533,6 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
     op->addTag(TAG_HTTP);
     handlers.push_back(op);
   }
-  {
-    SharedHandle<OptionHandler> op(new NumberOptionHandler
-				   (PREF_RETRY_WAIT,
-				    TEXT_RETRY_WAIT,
-				    "5",
-				    0, 60));
-    op->addTag(TAG_FTP);
-    op->addTag(TAG_HTTP);
-    handlers.push_back(op);
-  }
   {
     SharedHandle<OptionHandler> op(new BooleanOptionHandler
 				   (PREF_REUSE_URI,
diff --git a/src/download_helper.cc b/src/download_helper.cc
index 9e2346d2..2a4bfa8d 100644
--- a/src/download_helper.cc
+++ b/src/download_helper.cc
@@ -83,7 +83,6 @@ const std::vector<std::string>& listRequestOptions()
     PREF_OUT,
     PREF_PROXY_METHOD,
     PREF_REMOTE_TIME,
-    PREF_RETRY_WAIT,
     PREF_SPLIT,
     PREF_TIMEOUT,
     PREF_HTTP_AUTH_CHALLENGE,
diff --git a/src/prefs.cc b/src/prefs.cc
index 4881cad2..dbd9b2e4 100644
--- a/src/prefs.cc
+++ b/src/prefs.cc
@@ -48,8 +48,6 @@ const std::string V_ALL("all");
  * General preferences
  */
 // values: 1*digit
-const std::string PREF_RETRY_WAIT("retry-wait");
-// values: 1*digit
 const std::string PREF_TIMEOUT("timeout");
 // values: 1*digit
 const std::string PREF_DNS_TIMEOUT("dns-timeout");
diff --git a/src/prefs.h b/src/prefs.h
index fc3b4cfe..ae91b17f 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -52,8 +52,6 @@ extern const std::string V_ALL;
  * General preferences
  */
 // values: 1*digit
-extern const std::string PREF_RETRY_WAIT;
-// values: 1*digit
 extern const std::string PREF_TIMEOUT;
 // values: 1*digit
 extern const std::string PREF_DNS_TIMEOUT;