diff --git a/Gemfile b/Gemfile
index ed394ee..93e4a82 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,6 +3,7 @@ source :rubygems
 gem 'rainbow'
 group :development do
   gem 'rake'
+  gem 'rdoc'
   gem 'test-unit'
   gem 'shoulda'
   gem 'mocha', :require => false # Must be loaded only after ActiveSupport::TestCase is defined
diff --git a/Gemfile.lock b/Gemfile.lock
index 3aa5d9f..44442c0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,14 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    json (1.6.1)
     metaclass (0.0.1)
     mocha (0.10.0)
       metaclass (~> 0.0.1)
     rainbow (1.1.3)
     rake (0.9.2.2)
+    rdoc (3.11)
+      json (~> 1.4)
     shoulda (2.11.3)
     test-unit (2.4.2)
 
@@ -16,5 +19,6 @@ DEPENDENCIES
   mocha
   rainbow
   rake
+  rdoc
   shoulda
   test-unit
diff --git a/tasks/gem.rake b/tasks/gem.rake
index 4c61cb9..8c7f5e9 100644
--- a/tasks/gem.rake
+++ b/tasks/gem.rake
@@ -1,6 +1,6 @@
 require 'yaml'
 
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 spec = Gem::Specification.new do |s|
   s.name                  = GitRemoteBranch::NAME.dup
@@ -30,7 +30,7 @@ end
 
 #Creates clobber_package, gem, package and repackage tasks
 #Note on clobber_package: fortunately, this will clobber the CODE package
-Rake::GemPackageTask.new(spec) do |p|
+Gem::PackageTask.new(spec) do |p|
   p.gem_spec = spec
 end