diff --git a/Rakefile b/Rakefile
index 2b6eb89..06cfb4f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,57 +1,49 @@
+# encoding: utf-8
+
 require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "robustserver"
-    gem.summary = %Q{Robust Server}
-    gem.description = %Q{Protects your Server against SIGS and  rescues all exceptions.}
-    gem.email = "Denis.Knauf@gmail.com"
-    gem.homepage = "http://github.com/DenisKnauf/robustserver"
-    gem.authors = ["Denis Knauf"]
-    gem.files = %w[AUTHORS README.md VERSION lib/**/*.rb test/**/*.rb]
-    gem.require_paths = %w[lib]
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+	gem.name = "robustserver"
+	gem.summary = %Q{Robust Server}
+	gem.description = %Q{Protects your Server against SIGS and  rescues all exceptions.}
+	gem.email = "Denis.Knauf@gmail.com"
+	gem.homepage = "http://github.com/DenisKnauf/robustserver"
+	gem.authors = ["Denis Knauf"]
+	gem.files = %w[AUTHORS README.md VERSION lib/**/*.rb test/**/*.rb]
+	gem.require_paths = %w[lib]
+	# dependencies defined in Gemfile
 end
+Jeweler::RubygemsDotOrgTasks.new
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test' << 'ext'
-  test.pattern = 'test/**/*_test.rb'
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+=begin
+require 'rcov/rcovtask'
+Rcov::RcovTask.new do |test|
+  test.libs << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+  test.rcov_opts << '--exclude "gems/*"'
 end
-
-task :test => :check_dependencies
+=end
 
 task :default => :test
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION')
-    version = File.read('VERSION')
-  else
-    version = ""
-  end
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "sbdb #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'yard'
+YARD::Rake::YardocTask.new