diff --git a/ChangeLog b/ChangeLog
index eef1681e93..2b5c96f232 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Sep 16 18:12:13 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/webrick/cgi.rb (WEBrick::CGI#start): should set REMOTE_USER
+	  to request.user attribute.
+
+	* lib/webrick/httpservlet/filehandler.rb
+	  (WEBrick::HTTPServlet::FileHandler#initialize): should expand
+	  the pathname of document root directory.
+
 Wed Sep 15 20:22:23 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/sample/tkoptdb-safeTk.rb: fix a bug depend on the changes
diff --git a/lib/webrick/cgi.rb b/lib/webrick/cgi.rb
index 62c61f519a..5c38e42fc4 100644
--- a/lib/webrick/cgi.rb
+++ b/lib/webrick/cgi.rb
@@ -61,6 +61,7 @@ module WEBrick
         else
           req.path_info = env["PATH_INFO"].dup
         end
+        req.user = env["REMOTE_USER"]
         res.request_method = req.request_method
         res.request_uri = req.request_uri
         res.request_http_version = req.http_version
diff --git a/lib/webrick/httpservlet/filehandler.rb b/lib/webrick/httpservlet/filehandler.rb
index 8525d7bb1b..ab118ba5c9 100644
--- a/lib/webrick/httpservlet/filehandler.rb
+++ b/lib/webrick/httpservlet/filehandler.rb
@@ -139,7 +139,7 @@ module WEBrick
       def initialize(server, root, options={}, default=Config::FileHandler)
         @config = server.config
         @logger = @config[:Logger]
-        @root = root
+        @root = File.expand_path(root)
         if options == true || options == false
           options = { :FancyIndexing => options }
         end