diff --git a/ChangeLog b/ChangeLog
index bad575dd3e..bd95b11192 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jul  3 02:32:31 2002  Wakou Aoyama  <wakou@ruby-lang.org>
+
+	* lib/cgi.rb (CGI#initialize): improvement for mod_ruby.
+
 Tue Jul  2 14:13:11 2002  Wakou Aoyama  <wakou@ruby-lang.org>
 
 	* lib/cgi.rb (CGI#header): accept any type as value.
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 620e8aa699..2bed0bdec4 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -1897,6 +1897,7 @@ The hash keys are case sensitive. Ask the samples.
 
 
   def initialize(type = "query")
+    Apache.request.setup_cgi_env if defined?(MOD_RUBY)
     extend QueryExtension
     if "POST" != env_table['REQUEST_METHOD']
       initialize_query()  # set @params, @cookies