diff --git a/Rakefile b/Rakefile
index 90245c1db985379836dce1037d2adec3af607d88..81e864fd67893cd1b34c51f8252482784f84b1fc 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,5 @@
 require 'rake'
-require 'rdoc/task'
+require 'rake/rdoctask'
 
 env = %(PKG_BUILD="#{ENV['PKG_BUILD']}") if ENV['PKG_BUILD']
 
@@ -23,7 +23,7 @@ end
 
 
 desc "Generate documentation for the Rails framework"
-RDoc::Task.new do |rdoc|
+Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'doc/rdoc'
   rdoc.title    = "Ruby on Rails Documentation"
   rdoc.main     = "railties/README"
diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile
index 528e31a25d8d2bd1b155b32e6282e05fd2ff0877..94b7d10cbe7fe37dbe8c71259c9dec5acdc0906f 100644
--- a/actionmailer/Rakefile
+++ b/actionmailer/Rakefile
@@ -1,9 +1,9 @@
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
-require 'rdoc/task'
+require 'rake/rdoctask'
 require 'rake/packagetask'
-require 'rubygems/package_task'
+require 'rake/gempackagetask'
 require File.join(File.dirname(__FILE__), 'lib', 'action_mailer', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
@@ -29,7 +29,7 @@ Rake::TestTask.new { |t|
 
 
 # Generate the RDoc documentation
-RDoc::Task.new { |rdoc|
+Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Action Mailer -- Easy email delivery and testing"
   rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
@@ -56,15 +56,17 @@ spec = Gem::Specification.new do |s|
 
   s.add_dependency('actionpack', '= 2.3.17' + PKG_BUILD)
 
+  s.has_rdoc = true
   s.requirements << 'none'
   s.require_path = 'lib'
+  s.autorequire = 'action_mailer'
 
   s.files = [ "Rakefile", "install.rb", "README", "CHANGELOG", "MIT-LICENSE" ]
   s.files = s.files + Dir.glob( "lib/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   s.files = s.files + Dir.glob( "test/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
 end
   
-Gem::PackageTask.new(spec) do |p|
+Rake::GemPackageTask.new(spec) do |p|
   p.gem_spec = spec
   p.need_tar = true
   p.need_zip = true
diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 9d261d8c90d6b10b84528f6baa0b91c118b204fd..a2c4f71c427ea993053c5b1199e18d151ba10d7d 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -1,9 +1,9 @@
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
-require 'rdoc/task'
+require 'rake/rdoctask'
 require 'rake/packagetask'
-require 'rubygems/package_task'
+require 'rake/gempackagetask'
 require File.join(File.dirname(__FILE__), 'lib', 'action_pack', 'version')
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
@@ -45,7 +45,7 @@ end
 
 # Genereate the RDoc documentation
 
-RDoc::Task.new { |rdoc|
+Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Action Pack -- On rails from request to response"
   rdoc.options << '--line-numbers' << '--inline-source'
@@ -76,12 +76,14 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "actionpack"
   s.homepage = "http://www.rubyonrails.org"
 
+  s.has_rdoc = true
   s.requirements << 'none'
 
   s.add_dependency('activesupport', '= 2.3.17' + PKG_BUILD)
   s.add_dependency('rack', '~> 1.1.0')
 
   s.require_path = 'lib'
+  s.autorequire = 'action_controller'
 
   s.files = [ "Rakefile", "install.rb", "README", "RUNNING_UNIT_TESTS", "CHANGELOG", "MIT-LICENSE" ]
   dist_dirs.each do |dir|
@@ -89,7 +91,7 @@ spec = Gem::Specification.new do |s|
   end
 end
   
-Gem::PackageTask.new(spec) do |p|
+Rake::GemPackageTask.new(spec) do |p|
   p.gem_spec = spec
   p.need_tar = true
   p.need_zip = true
diff --git a/activemodel/Rakefile b/activemodel/Rakefile
index 6e7df2e78545e07166ded46ab7201d00f6cece3c..4b60f8d682340d2fafb04a847d8b3c44a56105dd 100755
--- a/activemodel/Rakefile
+++ b/activemodel/Rakefile
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 require 'rake'
 require 'rake/testtask'
-require 'rdoc/task'
+require 'rake/rdoctask'
 
 task :default => :test
 
@@ -13,7 +13,7 @@ Rake::TestTask.new do |t|
 end
 
 # Generate the RDoc documentation
-RDoc::Task.new do |rdoc|
+Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Active Model"
   rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
diff --git a/activerecord/Rakefile b/activerecord/Rakefile
index 6ebc6557878cad8a6ec566e7bacef391e6774f44..811b433f362acc422e045f4a1e5350a9f917939b 100644
--- a/activerecord/Rakefile
+++ b/activerecord/Rakefile
@@ -1,9 +1,9 @@
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
-require 'rdoc/task'
+require 'rake/rdoctask'
 require 'rake/packagetask'
-require 'rubygems/package_task'
+require 'rake/gempackagetask'
 
 require File.join(File.dirname(__FILE__), 'lib', 'active_record', 'version')
 require File.expand_path(File.dirname(__FILE__)) + "/test/config"
@@ -157,7 +157,7 @@ task :rebuild_frontbase_databases => 'frontbase:rebuild_databases'
 
 # Generate the RDoc documentation
 
-RDoc::Task.new { |rdoc|
+Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Active Record -- Object-relation mapping put on rails"
   rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
@@ -199,7 +199,9 @@ spec = Gem::Specification.new do |s|
   s.files.delete FIXTURES_ROOT + "/fixture_database.sqlite3"
   s.files.delete FIXTURES_ROOT + "/fixture_database_2.sqlite3"
   s.require_path = 'lib'
+  s.autorequire = 'active_record'
 
+  s.has_rdoc = true
   s.extra_rdoc_files = %w( README )
   s.rdoc_options.concat ['--main',  'README']
 
@@ -209,7 +211,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "activerecord"
 end
 
-Gem::PackageTask.new(spec) do |p|
+Rake::GemPackageTask.new(spec) do |p|
   p.gem_spec = spec
   p.need_tar = true
   p.need_zip = true
diff --git a/activeresource/Rakefile b/activeresource/Rakefile
index 0400dbe18276233719f1a054bce06919fc61d404..47d6e9374138f50b44ecb2a04ea8f34636b528fc 100644
--- a/activeresource/Rakefile
+++ b/activeresource/Rakefile
@@ -1,9 +1,9 @@
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
-require 'rdoc/task'
+require 'rake/rdoctask'
 require 'rake/packagetask'
-require 'rubygems/package_task'
+require 'rake/gempackagetask'
 
 require File.join(File.dirname(__FILE__), 'lib', 'active_resource', 'version')
 
@@ -38,7 +38,7 @@ Rake::TestTask.new { |t|
 
 # Generate the RDoc documentation
 
-RDoc::Task.new { |rdoc|
+Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Active Resource -- Object-oriented REST services"
   rdoc.options << '--line-numbers' << '--inline-source' << '-A cattr_accessor=object'
@@ -69,7 +69,9 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('activesupport', '= 2.3.17' + PKG_BUILD)
 
   s.require_path = 'lib'
+  s.autorequire = 'active_resource'
 
+  s.has_rdoc = true
   s.extra_rdoc_files = %w( README )
   s.rdoc_options.concat ['--main',  'README']
   
@@ -79,7 +81,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "activeresource"
 end
   
-Gem::PackageTask.new(spec) do |p|
+Rake::GemPackageTask.new(spec) do |p|
   p.gem_spec = spec
   p.need_tar = true
   p.need_zip = true
diff --git a/activesupport/Rakefile b/activesupport/Rakefile
index f874efeaa53374fbe0dbe4461294be08ff2d193a..d5ece391d75b301a8531b8a840a4dc613c821eed 100644
--- a/activesupport/Rakefile
+++ b/activesupport/Rakefile
@@ -1,6 +1,6 @@
 require 'rake/testtask'
-require 'rdoc/task'
-require 'rubygems/package_task'
+require 'rake/rdoctask'
+require 'rake/gempackagetask'
 
 require File.join(File.dirname(__FILE__), 'lib', 'active_support', 'version')
 
@@ -27,7 +27,7 @@ dist_dirs = [ "lib", "test"]
 
 # Genereate the RDoc documentation
 
-RDoc::Task.new { |rdoc|
+Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Active Support -- Utility classes and standard library extensions from Rails"
   rdoc.options << '--line-numbers' << '--inline-source'
@@ -48,6 +48,7 @@ spec = Gem::Specification.new do |s|
 
   s.files = [ "CHANGELOG", "README" ] + Dir.glob( "lib/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   s.require_path = 'lib'
+  s.has_rdoc = true
 
   s.author = "David Heinemeier Hansson"
   s.email = "david@loudthinking.com"
@@ -55,7 +56,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "activesupport"
 end
 
-Gem::PackageTask.new(spec) do |p|
+Rake::GemPackageTask.new(spec) do |p|
   p.gem_spec = spec
   p.need_tar = true
   p.need_zip = true
diff --git a/railties/Rakefile b/railties/Rakefile
index 9f6545b60a9ca2643d4e57bec4c43a224d20dd8e..f05d7cac923e0e2564185f1afdfe3dca33532c75 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -1,7 +1,7 @@
 require 'rake'
 require 'rake/testtask'
-require 'rdoc/task'
-require 'rubygems/package_task'
+require 'rake/rdoctask'
+require 'rake/gempackagetask'
 
 require 'date'
 require 'rbconfig'
@@ -267,7 +267,7 @@ task :generate_app_doc do
   system %{cd #{PKG_DESTINATION}; rake doc:app}
 end
 
-RDoc::Task.new { |rdoc|
+Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Railties -- Gluing the Engine to the Rails"
   rdoc.options << '--line-numbers' << '--inline-source' << '--accessor' << 'cattr_accessor=object'
@@ -320,11 +320,13 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('activeresource',   '= 2.3.17' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
+  s.has_rdoc = false
 
   s.files = PKG_FILES
   s.require_path = 'lib'
   s.bindir = "bin"                               # Use these for applications.
   s.executables = ["rails"]
+  s.default_executable = "rails"
 
   s.author = "David Heinemeier Hansson"
   s.email = "david@loudthinking.com"
@@ -332,7 +334,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "rails"
 end
 
-Gem::PackageTask.new(spec) do |pkg|
+Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end