diff --git a/Gemfile.lock b/Gemfile.lock
index c16080f..dd7f6b1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,8 +2,10 @@ PATH
   remote: .
   specs:
     rest-client (1.6.7)
+      jeweler (>= 1.8.4)
       mime-types (>= 1.16)
       netrc (~> 0.7.7)
+      rake (~> 0.9)
 
 GEM
   remote: https://rubygems.org/
@@ -11,8 +13,18 @@ GEM
     addressable (2.3.2)
     crack (0.3.1)
     diff-lcs (1.1.3)
+    git (1.2.5)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.7.5)
     mime-types (1.19)
     netrc (0.7.7)
+    rake (0.9.3)
+    rdoc (3.12)
+      json (~> 1.4)
     rspec (2.11.0)
       rspec-core (~> 2.11.0)
       rspec-expectations (~> 2.11.0)
@@ -30,5 +42,5 @@ PLATFORMS
 
 DEPENDENCIES
   rest-client!
-  rspec
+  rspec (>= 2.0)
   webmock (>= 0.9.1)
diff --git a/Rakefile b/Rakefile
index ac8cc01..de24f41 100644
--- a/Rakefile
+++ b/Rakefile
@@ -19,32 +19,32 @@ end
 
 ############################
 
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
 desc "Run all specs"
 task :spec => ["spec:unit", "spec:integration"]
 
 desc "Run unit specs"
-Spec::Rake::SpecTask.new('spec:unit') do |t|
-  t.spec_opts = ['--colour --format progress --loadby mtime --reverse']
-  t.spec_files = FileList['spec/*_spec.rb']
+RSpec::Core::RakeTask.new('spec:unit') do |t|
+  t.rspec_opts = ['--colour --format progress']
+  t.pattern = 'spec/*_spec.rb'
 end
 
 desc "Run integration specs"
-Spec::Rake::SpecTask.new('spec:integration') do |t|
-  t.spec_opts = ['--colour --format progress --loadby mtime --reverse']
-  t.spec_files = FileList['spec/integration/*_spec.rb']
+RSpec::Core::RakeTask.new('spec:integration') do |t|
+  t.rspec_opts = ['--colour --format progress']
+  t.pattern = 'spec/integration/*_spec.rb'
 end
 
 desc "Print specdocs"
-Spec::Rake::SpecTask.new(:doc) do |t|
-  t.spec_opts = ["--format", "specdoc", "--dry-run"]
-  t.spec_files = FileList['spec/*_spec.rb']
+RSpec::Core::RakeTask.new(:doc) do |t|
+  t.rspec_opts = ["--format", "specdoc", "--dry-run"]
+  t.pattern = 'spec/*_spec.rb'
 end
 
 desc "Run all examples with RCov"
-Spec::Rake::SpecTask.new('rcov') do |t|
-  t.spec_files = FileList['spec/*_spec.rb']
+RSpec::Core::RakeTask.new('rcov') do |t|
+  t.pattern = 'spec/*_spec.rb'
   t.rcov = true
   t.rcov_opts = ['--exclude', 'examples']
 end
@@ -53,7 +53,7 @@ task :default => :spec
 
 ############################
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 Rake::RDocTask.new do |t|
   t.rdoc_dir = 'rdoc'
diff --git a/rest-client.gemspec b/rest-client.gemspec
index 0b22100..1ed7ad1 100644
--- a/rest-client.gemspec
+++ b/rest-client.gemspec
@@ -61,17 +61,19 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
       s.add_development_dependency(%q<webmock>, [">= 0.9.1"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0"])
     else
       s.add_dependency(%q<mime-types>, [">= 1.16"])
       s.add_dependency(%q<webmock>, [">= 0.9.1"])
-      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 2.0"])
     end
   else
     s.add_dependency(%q<mime-types>, [">= 1.16"])
     s.add_dependency(%q<webmock>, [">= 0.9.1"])
-    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 2.0"])
   end
+  s.add_dependency(%q<jeweler>, [">= 1.8.4"])
+  s.add_dependency(%q<rake>, ["~> 0.9"])
   s.add_dependency(%q<netrc>, ["~> 0.7.7"])
 end