diff --git a/Rakefile b/Rakefile
index 59f6b965f60..4d9e80eb9da 100644
--- a/Rakefile
+++ b/Rakefile
@@ -10,7 +10,7 @@ PROJECTS = %w(activesupport activemodel actionpack actionmailer activeresource a
 desc 'Run all tests by default'
 task :default => %w(test test:isolated)
 
-%w(test test:isolated rdoc package gem).each do |task_name|
+%w(test test:isolated package gem).each do |task_name|
   desc "Run #{task_name} task for all projects"
   task task_name do
     errors = []
@@ -67,18 +67,10 @@ RDoc::Task.new do |rdoc|
   rdoc.title    = "Ruby on Rails Documentation"
 
   rdoc.options << '-f' << 'horo'
-  rdoc.options << '--charset' << 'utf-8'
-  rdoc.options << '--main' << 'README.rdoc'
+  rdoc.options << '-c' << 'utf-8'
+  rdoc.options << '-m' << 'README.rdoc'
 
-  # Workaround: RDoc assumes that rdoc.template can be required, and that
-  # rdoc.template.upcase is a constant living in RDoc::Generator::HTML
-  # which holds the actual template class.
-  # 
-  # We put 'doc/template' in the load path to be able to set the template
-  # to the string 'horo' and thus meet those RDoc's assumptions.
-  $:.unshift('doc/template')
-
-  rdoc.template = ENV['template'] ? "#{ENV['template']}.rb" : 'horo'
+  rdoc.rdoc_files.include('README.rdoc')
 
   rdoc.rdoc_files.include('railties/CHANGELOG')
   rdoc.rdoc_files.include('railties/MIT-LICENSE')