diff --git a/ChangeLog b/ChangeLog
index 639993a7e7..26ed674f46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jan 29 00:18:54 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/cgi.rb: set autoload to CGI::HtmlExtension.  [ruby-dev:40194]
+
 Thu Jan 28 09:44:19 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* regcomp.c (onig_compile): initialize ScanEnv.
diff --git a/lib/cgi.rb b/lib/cgi.rb
index 6355a92804..3af271523b 100644
--- a/lib/cgi.rb
+++ b/lib/cgi.rb
@@ -272,3 +272,4 @@ raise "Please, use ruby 1.9.0 or later." if RUBY_VERSION < "1.9.0"
 require 'cgi/core'
 require 'cgi/cookie'
 require 'cgi/util'
+CGI.autoload(:HtmlExtension, 'cgi/html')