diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile
index df996acbc241b20166722625a19de798c7e971c6..e7d8ee299de87153f32cd6eb13558493a45d761e 100755
--- a/actionmailer/Rakefile
+++ b/actionmailer/Rakefile
@@ -1,7 +1,7 @@
 #!/usr/bin/env rake
 require 'rake/testtask'
 require 'rake/packagetask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 desc "Default Task"
 task :default => [ :test ]
@@ -24,7 +24,7 @@ end
 
 spec = eval(File.read('actionmailer.gemspec'))
 
-Rake::GemPackageTask.new(spec) do |p|
+Gem::PackageTask.new(spec) do |p|
   p.gem_spec = spec
 end
 
diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index 9030db9f7a7dc63e568f7c30c86c0f7ef0d638f4..66dd88f0c6c8a28668812e36829f59c5898f24a3 100755
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -1,7 +1,7 @@
 #!/usr/bin/env rake
 require 'rake/testtask'
 require 'rake/packagetask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 desc "Default Task"
 task :default => :test
@@ -36,7 +36,7 @@ end
 
 spec = eval(File.read('actionpack.gemspec'))
 
-Rake::GemPackageTask.new(spec) do |p|
+Gem::PackageTask.new(spec) do |p|
   p.gem_spec = spec
 end
 
diff --git a/activemodel/Rakefile b/activemodel/Rakefile
index 0a10912695604bdb9cd0393c3d5f840c4cc67367..c4b020196dd7d2dff89bd56527f0babb5ae96a22 100755
--- a/activemodel/Rakefile
+++ b/activemodel/Rakefile
@@ -20,11 +20,11 @@ namespace :test do
 end
 
 require 'rake/packagetask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 spec = eval(File.read("#{dir}/activemodel.gemspec"))
 
-Rake::GemPackageTask.new(spec) do |p|
+Gem::PackageTask.new(spec) do |p|
   p.gem_spec = spec
 end
 
diff --git a/activerecord/Rakefile b/activerecord/Rakefile
index e414c4fb1c4d085e6744eacd899ccf781c2be614..346c7e81424b4dcf8b7b8e11829306a82be371f6 100755
--- a/activerecord/Rakefile
+++ b/activerecord/Rakefile
@@ -1,7 +1,7 @@
 #!/usr/bin/env rake
 require 'rake/testtask'
 require 'rake/packagetask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 require File.expand_path(File.dirname(__FILE__)) + "/test/config"
 
@@ -171,7 +171,7 @@ task :rebuild_frontbase_databases => 'frontbase:rebuild_databases'
 
 spec = eval(File.read('activerecord.gemspec'))
 
-Rake::GemPackageTask.new(spec) do |p|
+Gem::PackageTask.new(spec) do |p|
   p.gem_spec = spec
 end
 
diff --git a/activeresource/Rakefile b/activeresource/Rakefile
index 42e450da6614fea1271ee7d3985cf19ca99fb765..b1c18ff189824a36895fe6061e5ddf36813d65ca 100755
--- a/activeresource/Rakefile
+++ b/activeresource/Rakefile
@@ -1,7 +1,7 @@
 #!/usr/bin/env rake
 require 'rake/testtask'
 require 'rake/packagetask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 desc "Default Task"
 task :default => [ :test ]
@@ -26,7 +26,7 @@ end
 
 spec = eval(File.read('activeresource.gemspec'))
 
-Rake::GemPackageTask.new(spec) do |p|
+Gem::PackageTask.new(spec) do |p|
   p.gem_spec = spec
 end
 
diff --git a/activesupport/Rakefile b/activesupport/Rakefile
index d117ca63560652188e687db83eebd8f1a22acfdd..822c9d98ae8378d7e3d9a840eab36207d3eeefe9 100755
--- a/activesupport/Rakefile
+++ b/activesupport/Rakefile
@@ -1,5 +1,5 @@
 require 'rake/testtask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 task :default => :test
 Rake::TestTask.new do |t|
@@ -20,7 +20,7 @@ dist_dirs = [ "lib", "test"]
 
 spec = eval(File.read('activesupport.gemspec'))
 
-Rake::GemPackageTask.new(spec) do |p|
+Gem::PackageTask.new(spec) do |p|
   p.gem_spec = spec
 end
 
diff --git a/railties/Rakefile b/railties/Rakefile
index 827b2ba0cd4242db23371db6fa53da3a830532d7..be9a77d4e45d7ae3d286228925f87209bacfb5cb 100755
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -1,6 +1,6 @@
 #!/usr/bin/env rake
 require 'rake/testtask'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 require 'date'
 require 'rbconfig'
@@ -55,7 +55,7 @@ end
 
 spec = eval(File.read('railties.gemspec'))
 
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end