diff --git a/.rspec b/.rspec
new file mode 100644
index 0000000..4e1e0d2
--- /dev/null
+++ b/.rspec
@@ -0,0 +1 @@
+--color
diff --git a/Gemfile b/Gemfile
index 8210f97..b2b1830 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,9 +7,9 @@ gem "thor", ">= 0.14.0"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rake"
-  gem "rspec", ">= 1.2.9"
-  gem "bundler", ">= 0.9.5"
-  gem "jeweler", ">= 1.5.0.pre2"
+  gem "rspec", "~> 2.1.0"
+  gem "bundler", "~> 1.0.0"
+  gem "jeweler", ">= 1.5.0.pre6"
   gem "rcov", ">= 0"
   gem "test-construct"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 6be927c..517dcb5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,14 +1,22 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    diff-lcs (1.1.2)
     git (1.2.5)
-    jeweler (1.5.0.pre3)
+    jeweler (1.5.0.pre6)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
     rake (0.8.7)
     rcov (0.9.8)
-    rspec (1.3.0)
+    rspec (2.1.0)
+      rspec-core (~> 2.1.0)
+      rspec-expectations (~> 2.1.0)
+      rspec-mocks (~> 2.1.0)
+    rspec-core (2.1.0)
+    rspec-expectations (2.1.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.1.0)
     test-construct (1.2.0)
     thor (0.14.0)
 
@@ -16,10 +24,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 0.9.5)
-  jeweler (>= 1.5.0.pre2)
+  bundler (~> 1.0.0)
+  jeweler (>= 1.5.0.pre6)
   rake
   rcov
-  rspec (>= 1.2.9)
+  rspec (~> 2.1.0)
   test-construct
   thor (>= 0.14.0)
diff --git a/Rakefile b/Rakefile
index 7ca7a16..8b7b576 100644
--- a/Rakefile
+++ b/Rakefile
@@ -30,18 +30,17 @@ end
 Jeweler::GemcutterTasks.new
 
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end
 
+
 task :default => :spec
 
 require 'rake/rdoctask'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 57ef7c8..f34d912 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,11 +1,11 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'homesick'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
 require 'construct'
 
-Spec::Runner.configure do |config|
+Rspec.configure do |config|
   config.include Construct::Helpers
 
   config.before do