diff --git a/ChangeLog b/ChangeLog
index 11e2e63ea1..434ff531e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Apr  2 14:43:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/rdoc.rb (RDoc::Generator): defer by autoload.
+
+	* lib/rdoc/generator/darkfish.rb: use normal library instead of
+	  gem.
+
 Fri Apr  2 14:26:26 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/rdoc/rdoc.rb (RDoc::RDoc#parse_files): don't branch by
diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb
index a25475d39f..51339ebce3 100644
--- a/lib/rdoc/generator/darkfish.rb
+++ b/lib/rdoc/generator/darkfish.rb
@@ -1,11 +1,6 @@
-#!ruby
+# -*- mode: ruby; ruby-indent-level: 2; tab-width: 2 -*-
 # vim: noet ts=2 sts=8 sw=2
 
-unless File.exist? File.expand_path('../.svn', __FILE__) then
-  require 'rubygems'
-  gem 'rdoc', '>= 2.4'
-end
-
 require 'pp'
 require 'pathname'
 require 'fileutils'
diff --git a/lib/rdoc/rdoc.rb b/lib/rdoc/rdoc.rb
index b2c7d55b77..bdd9dc8858 100644
--- a/lib/rdoc/rdoc.rb
+++ b/lib/rdoc/rdoc.rb
@@ -426,6 +426,7 @@ rescue LoadError
 end
 
 # require built-in generators after discovery in case they've been replaced
-require 'rdoc/generator/darkfish'
-require 'rdoc/generator/ri'
-
+module RDoc::Generator
+  autoload :Darkfish, 'rdoc/generator/darkfish'
+  autoload :RI, 'rdoc/generator/ri'
+end