diff --git a/.gitignore b/.gitignore
index 431ac0b..a676a97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .DS_Store
 pkg
+.rvmrc
 *~
diff --git a/Rakefile b/Rakefile
index 7c39a26..295713a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -18,12 +18,28 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-task :default => :spec
-desc "Run all specs"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ['--options', 'spec/spec.opts']
+begin
+  # Rspec 1.3
+  require 'spec/rake/spectask'
+  task :default => :spec
+  desc "Run all specs"
+  Spec::Rake::SpecTask.new do |t|
+    t.spec_files = FileList['spec/**/*_spec.rb']
+    t.spec_opts = ['--options', 'spec/spec.opts']
+  end
+  
+rescue LoadError
+  # RSpec 2
+  require 'rspec/core/rake_task'
+  task :default => :spec
+  desc "Run all specs"
+  RSpec::Core::RakeTask.new do |t|
+    t.pattern = "spec/**/*_spec.rb"
+    t.rspec_opts = %w(-fs --color)
+  end
+  
+rescue LoadError
+  puts "Rspec not available. Install it with: gem install rspec"
 end
 
 require 'rake/rdoctask'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 4729d52..057dc37 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,20 +1,14 @@
-ENV["RAILS_ROOT"] ||= File.dirname(__FILE__) + '/../../../..'
-ENV["RAILS_ENV"]    = "test"
-
-#require File.expand_path(File.dirname(ENV['RAILS_ROOT']) + "/config/environment")
 require 'rubygems'
-require 'spec'
 
 require 'active_record'
 require 'action_controller'
 require 'action_view'
 
-
 require 'event_calendar'
 require 'event_calendar/calendar_helper'
 
 require File.dirname(__FILE__) + '/../init.rb'
-require 'spec/fixtures/models'
+require File.dirname(__FILE__) + "/fixtures/models"
 
 ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
 ActiveRecord::Migration.verbose = false