diff --git a/ChangeLog b/ChangeLog
index 1b18143237..9064d78b92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb 22 16:24:05 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/webrick/test_cgi.rb: should support platforms which search
+	  library path from the interpreter's path.
+	  And, support test without install incidentally.
+
 Wed Feb 22 14:21:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* bignum.c (bignorm): x may not be a bignum.  [ruby-dev:28367]
diff --git a/test/webrick/test_cgi.rb b/test/webrick/test_cgi.rb
index 7e3f4ee5f0..c71f18c53b 100644
--- a/test/webrick/test_cgi.rb
+++ b/test/webrick/test_cgi.rb
@@ -17,6 +17,13 @@ class TestWEBrickCGI < Test::Unit::TestCase
       :CGIInterpreter => EnvUtil.rubybin,
       :DocumentRoot => File.dirname(__FILE__),
       :DirectoryIndex => ["webrick.cgi"],
+      :RequestHandler => Proc.new{|req, res|
+        def req.meta_vars
+          meta = super
+          meta["RUBYLIB"] = $:.join(File::PATH_SEPARATOR)
+          return meta
+        end
+      },
     }
     if RUBY_PLATFORM =~ /mswin32|mingw|cygwin|bccwin32/
       config[:CGIPathEnv] = ENV['PATH'] # runtime dll may not be in system dir.