diff --git a/Rakefile b/Rakefile
index 771bc47..5f63cb1 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,15 +1,6 @@
 require 'rubygems'
 require 'rake'
 
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new do |t|
-    t.files   = ['lib/**/*.rb', 'lib/**/*.rb']
-  end
-rescue LoadError
-#  puts "YARD is not available. For generating docs, you'll need to sudo gem install yard"
-end
-
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
@@ -40,8 +31,8 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   if File.exist?('VERSION.yml')
     config = YAML.load(File.read('VERSION.yml'))
     version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
@@ -54,6 +45,3 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-
-
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6a6a65c..338a87f 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -27,6 +27,6 @@ def fake_response(xml)
   mock('RestClientFakeResponse', :body => xml)
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
 
 end