diff --git a/Rakefile b/Rakefile
index 2995527..56580df 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1 +1,16 @@
-require "bundler/gem_tasks"
+require 'rubygems'
+require 'rspec/core/rake_task'
+require 'yard'
+
+desc "Run all examples"
+RSpec::Core::RakeTask.new(:spec) do |t|
+  #t.rspec_path = 'bin/rspec'
+  t.rspec_opts = %w[--color]
+end
+
+YARD::Rake::YardocTask.new do |t|
+  t.files   = ['lib/**/*.rb']
+  #t.options = ['--any', '--extra', '--opts'] # optional
+end
+
+task :default => [:spec]
diff --git a/pundit.gemspec b/pundit.gemspec
index 172ebd3..f9cfaf2 100644
--- a/pundit.gemspec
+++ b/pundit.gemspec
@@ -20,4 +20,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "rails", "~>3.0"
   gem.add_development_dependency "rspec", "~>2.0"
   gem.add_development_dependency "pry"
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "yard"
 end