diff --git a/ChangeLog b/ChangeLog
index 0db0ece9c8..f34a2e2486 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Oct 14 16:39:37 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/config.rb (Config::FileHandler): :UserDir should be nil.
+	  It is harmful to permit the access to ~/public_html by default.
+	  suggested by Hiroyuki Iwatsuki.
+
 Thu Oct 13 23:29:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (HEAPCNT): bison allocates indivisible size.
diff --git a/lib/webrick/config.rb b/lib/webrick/config.rb
index f787eea614..19d0c7ab14 100644
--- a/lib/webrick/config.rb
+++ b/lib/webrick/config.rb
@@ -71,7 +71,7 @@ module WEBrick
       :HandlerCallback   => nil,
       :DirectoryCallback => nil,
       :FileCallback      => nil,
-      :UserDir           => "public_html",
+      :UserDir           => nil,  # e.g. "public_html"
       :AcceptableLanguages => []  # ["en", "ja", ... ]
     }