diff --git a/.travis.yml b/.travis.yml
index e42ee7e..d10511d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,9 @@ rvm:
   - 2.1.0
 
 env:
-  - RAILS=v4.1.0.beta1 DB=sqlite3
-  - RAILS=v4.1.0.beta1 DB=mysql
-  - RAILS=v4.1.0.beta1 DB=postgres
+  - RAILS=master DB=sqlite3
+  - RAILS=master DB=mysql
+  - RAILS=master DB=postgres
 
 
 before_script:
diff --git a/Gemfile b/Gemfile
index a5d46e5..b759daf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,9 +3,13 @@ gemspec
 
 gem 'rake'
 
-rails = ENV['RAILS'] || '4-0-stable'
+rails = ENV['RAILS'] || 'master'
 
-gem 'arel'
+gem 'arel', '~> 5.0.0'
+
+gem 'polyamorous',
+  github: 'activerecord-hackery/polyamorous',
+  branch: 'rails-4.1'
 
 case rails
 when /\// # A path
diff --git a/ransack.gemspec b/ransack.gemspec
index b807e5d..2314460 100644
--- a/ransack.gemspec
+++ b/ransack.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'activerecord', '>= 4.0'
   s.add_dependency 'activesupport', '>= 4.0'
   s.add_dependency 'i18n'
-  s.add_dependency 'polyamorous', '~> 0.6.0'
+#  s.add_dependency 'polyamorous', '~> 0.6.0'
   s.add_development_dependency 'rspec', '~> 2.8.0'
   s.add_development_dependency 'machinist', '~> 1.0.6'
   s.add_development_dependency 'faker', '~> 0.9.5'