diff --git a/Rakefile b/Rakefile
old mode 100644
new mode 100755
index b0e67cf1..72a078c9
--- a/Rakefile
+++ b/Rakefile
@@ -1,33 +1,11 @@
-# -*- encoding: utf-8 -*-
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require 'rubygems'
-require 'bundler/setup'
-require 'awesome_nested_set/version'
+#!/usr/bin/env rake
 
-task :default => :spec
+require 'bundler/gem_helper'
+require 'rspec/core/rake_task'
+require 'appraisal'
 
-task :spec do
-  puts "\n" + (cmd = "bundle exec rspec spec")
-#   %w(3.0 3.1 3.2).each do |rails_version|
-#     puts "\n" + (cmd = "BUNDLE_GEMFILE='gemfiles/Gemfile.rails-#{rails_version}.rb' bundle exec rspec spec")
-     system cmd
-#   end
-end
+Bundler::GemHelper.install_tasks(name: 'awesome_nested_set')
 
-task :build do
-  system "gem build awesome_nested_set.gemspec"
-end
+RSpec::Core::RakeTask.new(:spec)
 
-task :release => :build do
-  system "gem push awesome_nested_set-#{AwesomeNestedSet::VERSION}.gem"
-end
-
-require 'rdoc/task'
-desc 'Generate documentation for the awesome_nested_set plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'AwesomeNestedSet'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+task default: :spec