diff --git a/.gitignore b/.gitignore
index d87d4be..6dc8f75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 .config
 .yardoc
 Gemfile.lock
+Mongoid4.gemfile.lock
 InstalledFiles
 _yardoc
 coverage
diff --git a/.travis.yml b/.travis.yml
index f8d671b..2c8baec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,8 +7,10 @@ rvm:
   - rbx-19mode
 gemfile:
   - Gemfile
-notifications:
-  recipients:
-    - nicholas@bruning.com.au
+  - Mongoid4.gemfile
 services:
   - mongodb
+branches:
+  only:
+    - master
+    - feature-mongoid4
diff --git a/Mongoid4.gemfile b/Mongoid4.gemfile
new file mode 100644
index 0000000..43739ec
--- /dev/null
+++ b/Mongoid4.gemfile
@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gem 'mongoid', '~> 4.0.0', github: 'mongoid/mongoid'
+
+# Specify your gem's dependencies in mongoid-enum.gemspec
+gemspec
diff --git a/lib/mongoid/enum.rb b/lib/mongoid/enum.rb
index bf9117a..981b337 100644
--- a/lib/mongoid/enum.rb
+++ b/lib/mongoid/enum.rb
@@ -26,7 +26,7 @@ module Mongoid
         end
 
         values.each do |value|
-          scope value, where(field_name => value)
+          scope value, ->{ where(field_name => value) }
 
           if multiple
             class_eval "def #{value}?() self.#{field_name}.include?(:#{value}) end"
diff --git a/mongoid-enum.gemspec b/mongoid-enum.gemspec
index e710cf5..19be000 100644
--- a/mongoid-enum.gemspec
+++ b/mongoid-enum.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "mongoid", "~>3.1"
+  spec.add_runtime_dependency "mongoid", ["> 3.0", "< 4.1"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"