diff --git a/.gitignore b/.gitignore
index 2c1c411..9352ae3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,18 +18,20 @@ tmtags
 
 ## PROJECT::GENERAL
 *.gem
-coverage
 rdoc
-pkg
-tmp
-doc
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
 log
-.yardoc
+/.yardoc
+/_yardoc/
 measurements
 
 ## BUNDLER
-.bundle
-Gemfile.*
+/.bundle/
+/Gemfile.lock
 
 ## PROJECT::SPECIFIC
 vendor
diff --git a/.rspec b/.rspec
new file mode 100644
index 0000000..8c18f1a
--- /dev/null
+++ b/.rspec
@@ -0,0 +1,2 @@
+--format documentation
+--color
diff --git a/Rakefile b/Rakefile
index aee265a..130c5b8 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,9 +1,11 @@
-require 'rubygems'
-require 'rake'
+require "bundler/gem_tasks"
 
-FileList['tasks/**/*.rake'].each { |task| import task }
+# require "rspec/core/rake_task"
+# RSpec::Core::RakeTask.new(:spec)
 
 require "spec/rake/spectask"
 Spec::Rake::SpecTask.new
 
+FileList['tasks/**/*.rake'].each { |task| import task }
+
 task :default => :spec
diff --git a/dm-rails.gemspec b/dm-rails.gemspec
index b00245e..45639a5 100644
--- a/dm-rails.gemspec
+++ b/dm-rails.gemspec
@@ -1,25 +1,27 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/dm-rails/version', __FILE__)
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'dm-rails/version'
 
-Gem::Specification.new do |gem|
-  gem.authors     = [ 'Martin Gamsjaeger (snusnu)', 'Dan Kubb' ]
-  gem.email       = [ 'gamsnjaga@gmail.com' ]
-  gem.summary     = "Integrate DataMapper with Rails 3"
-  gem.description = gem.summary
-  gem.homepage    = "http://datamapper.org"
+Gem::Specification.new do |spec|
+  spec.name             = "dm-rails"
+  spec.version          = DataMapper::Rails::VERSION
+  spec.authors          = [ 'Martin Gamsjaeger (snusnu)', 'Dan Kubb' ]
+  spec.email            = [ 'gamsnjaga@gmail.com' ]
+  spec.summary          = "Integrate DataMapper with Rails 3..5"
+  spec.description      = spec.summary
+  spec.homepage         = "http://datamapper.org"
 
-  gem.files            = `git ls-files`.split("\n")
-  gem.test_files       = `git ls-files -- {spec}/*`.split("\n")
-  gem.extra_rdoc_files = %w[LICENSE README.rdoc]
+  spec.files            = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.test_files       = `git ls-files -- {spec}/*`.split("\n")
+  spec.extra_rdoc_files = %w[LICENSE README.rdoc]
 
-  gem.name          = "dm-rails"
-  gem.require_paths = [ "lib" ]
-  gem.version       = DataMapper::Rails::VERSION
+  spec.require_paths = [ "lib" ]
 
-  gem.add_runtime_dependency('dm-active_model', '~> 1.2', '>= 1.2.0')
-  gem.add_runtime_dependency('actionpack',      '>= 3.0', '< 6.0')
-  gem.add_runtime_dependency('railties',        '>= 3.0', '< 6.0')
+  spec.add_runtime_dependency('dm-active_model', '~> 1.2', '>= 1.2.0')
+  spec.add_runtime_dependency('actionpack',      '>= 3.0', '< 6.0')
+  spec.add_runtime_dependency('railties',        '>= 3.0', '< 6.0')
 
-  gem.add_development_dependency('rake',      '~> 0.9.2')
-  gem.add_development_dependency('rspec',     '~> 1.3.2')
+  spec.add_development_dependency('rake',      '~> 0.9.2')
+  spec.add_development_dependency('rspec',     '~> 1.3.2')
 end