diff --git a/.gitignore b/.gitignore
index c1e0daf..baba976 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+*.gem
diff --git a/Rakefile b/Rakefile
index 3d098f4..01b41d6 100644
--- a/Rakefile
+++ b/Rakefile
@@ -10,7 +10,7 @@ begin
     gem.email = "martin.rehfeld@glnetworks.de"
     gem.homepage = "http://github.com/martinrehfeld/role_model"
     gem.authors = ["Martin Rehfeld"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "rspec", "~> 1"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -18,19 +18,23 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
+begin
+  require 'spec/rake/spectask'
+  Spec::Rake::SpecTask.new(:spec) do |spec|
+    spec.libs << 'lib' << 'spec'
+    spec.spec_files = FileList['spec/**/*_spec.rb']
+  end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-  spec.rcov_opts.concat ['--exclude', 'rcov.rb']
-  spec.rcov_opts.concat ['--exclude', '.*_spec.rb']
-  spec.rcov_opts.concat ['--exclude', 'spec_helper.rb']
+  Spec::Rake::SpecTask.new(:rcov) do |spec|
+    spec.libs << 'lib' << 'spec'
+    spec.pattern = 'spec/**/*_spec.rb'
+    spec.rcov = true
+    spec.rcov_opts.concat ['--exclude', 'rcov.rb']
+    spec.rcov_opts.concat ['--exclude', '.*_spec.rb']
+    spec.rcov_opts.concat ['--exclude', 'spec_helper.rb']
+  end
+rescue LoadError
+  STDERR.puts "Rspec 1.x not available"
 end
 
 task :spec => :check_dependencies
diff --git a/role_model.gemspec b/role_model.gemspec
index 4168fe5..7da79e4 100644
--- a/role_model.gemspec
+++ b/role_model.gemspec
@@ -1,64 +1,61 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{role_model}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Rehfeld"]
-  s.date = %q{2010-10-10}
+  s.date = %q{2011-04-30}
   s.description = %q{Ever needed to assign roles to a model, say a User, and build conditional behaviour on top of that? Enter RoleModel -- roles have never been easier! Just declare your roles and you are done. Assigned roles will be stored as a bitmask.}
   s.email = %q{martin.rehfeld@glnetworks.de}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/role_model.rb",
-     "lib/role_model/class_methods.rb",
-     "lib/role_model/implementation.rb",
-     "lib/role_model/roles.rb",
-     "role_model.gemspec",
-     "spec/custom_matchers.rb",
-     "spec/custom_matchers_spec.rb",
-     "spec/role_model_spec.rb",
-     "spec/roles_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/role_model.rb",
+    "lib/role_model/class_methods.rb",
+    "lib/role_model/implementation.rb",
+    "lib/role_model/roles.rb",
+    "role_model.gemspec",
+    "spec/custom_matchers.rb",
+    "spec/custom_matchers_spec.rb",
+    "spec/role_model_spec.rb",
+    "spec/roles_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/martinrehfeld/role_model}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{Declare, assign and query roles with ease}
   s.test_files = [
     "spec/custom_matchers.rb",
-     "spec/custom_matchers_spec.rb",
-     "spec/role_model_spec.rb",
-     "spec/roles_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/custom_matchers_spec.rb",
+    "spec/role_model_spec.rb",
+    "spec/roles_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<rspec>, ["~> 1"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<rspec>, ["~> 1"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<rspec>, ["~> 1"])
   end
 end