diff --git a/.travis.yml b/.travis.yml
index 59600e6c..73bba4b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ env:
   - MONGOID_VERSION=3
   - MONGOID_VERSION=4
   - MONGOID_VERSION=5
+  - MONGOID_VERSION=6
   - MONGOID_VERSION=HEAD
 
 rvm:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d062017..168f366c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 5.3.1 (Next)
 
 * Your contribution here.
+* [#231](https://github.com/mongoid/mongoid-slug/pull/231): Compatibility with Mongoid 6 - [@moodlemags](https://github.com/moodlemags).
 
 ## 5.3.0 (2016/09/11)
 
diff --git a/Gemfile b/Gemfile
index a3e37a90..d397eebf 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,12 +2,14 @@ source 'https://rubygems.org'
 
 gemspec name: 'mongoid-slug'
 
-case version = ENV['MONGOID_VERSION'] || '5'
+case version = ENV['MONGOID_VERSION'] || '6'
 when 'HEAD'
   gem 'mongoid', github: 'mongodb/mongoid'
   gem 'mongoid_paranoia', github: 'simi/mongoid_paranoia'
   gem 'mongoid-observers'
   gem 'rails-observers', github: 'rails/rails-observers'
+when /^6/
+  gem 'mongoid', '~> 6.0.0'
 when /^5/
   gem 'mongoid', '~> 5.0'
   gem 'mongoid_paranoia'