diff --git a/ChangeLog b/ChangeLog
index 0ce11b7c09..3f2bb5eb73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Mar 29 00:03:51 2011 Tajima Akil <artonx@yahoo.co.jp>	
+
+	* test/webrick/test_filehandler.rb (test_short_filename):
+	 read real short filename by cmd because smb mounted files
+	 have different naming convention.
+
 Mon Mar 28 11:38:08 2011  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/date/date_core.c (date_s_today): use int for year.
diff --git a/test/webrick/test_filehandler.rb b/test/webrick/test_filehandler.rb
index e4b672af8d..fdb2d8a7e2 100644
--- a/test/webrick/test_filehandler.rb
+++ b/test/webrick/test_filehandler.rb
@@ -216,8 +216,12 @@ class WEBrick::TestFileHandler < Test::Unit::TestCase
     }
     TestWEBrick.start_httpserver(config) do |server, addr, port, log|
       http = Net::HTTP.new(addr, port)
-
-      req = Net::HTTP::Get.new("/webric~1.cgi/test")
+      if windows?
+        fname = IO.popen("dir /x webrick_long_filename.cgi", "r").read.match(/\s(w.+?cgi)\s/i)[1].downcase
+      else
+        fname = "webric~1.cgi"
+      end
+      req = Net::HTTP::Get.new("/#{fname}/test")
       http.request(req) do |res|
         if windows?
           assert_equal("200", res.code, log.call)