diff --git a/ChangeLog b/ChangeLog
index 17b39e3b..a3993193 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-13  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Changed the default value of --uri-selector option from 'inorder'
+	to 'feedback'
+	* src/OptionHandlerFactory.cc
+	
 2009-03-13  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Included current URI in exception message.
diff --git a/src/OptionHandlerFactory.cc b/src/OptionHandlerFactory.cc
index 2b8ce784..e59c777f 100644
--- a/src/OptionHandlerFactory.cc
+++ b/src/OptionHandlerFactory.cc
@@ -537,7 +537,7 @@ OptionHandlers OptionHandlerFactory::createOptionHandlers()
     SharedHandle<OptionHandler> op(new ParameterOptionHandler
 				   (PREF_URI_SELECTOR,
 				    TEXT_URI_SELECTOR,
-				    V_INORDER,
+				    V_FEEDBACK,
 				    std::deque<std::string>
 				    (&params[0], &params[arrayLength(params)])));
     op->addTag(TAG_FTP);