diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index e7d5b8f..32c18cd 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,3 +1,24 @@
+1.5.0 (not yet released)
+
+* Added an Ability generator - see issue #170
+
+* Added DataMapper support (thanks natemueller)
+
+* Added Mongoid support (thanks bowsersenior)
+
+* Added skip_load_and_authorize_resource methods to controller class - see issue #164
+
+* Added support for uncountable resources in index action - see issue #193
+
+* Cleaned up README and added spec/README
+
+* Internal: renamed CanDefinition to Rule
+
+* Internal: added a model adapter layer for easily supporting more ORMs
+
+* Internal: added .rvmrc to auto-switch to 1.8.7 with gemset - see issue #231
+
+
 1.4.1 (November 12, 2010)
 
 * Renaming skip_authorization to skip_authorization_check - see issue #169
diff --git a/spec/cancan/model_adapters/mongoid_adapter_spec.rb b/spec/cancan/model_adapters/mongoid_adapter_spec.rb
index 9b92ea9..8543990 100644
--- a/spec/cancan/model_adapters/mongoid_adapter_spec.rb
+++ b/spec/cancan/model_adapters/mongoid_adapter_spec.rb
@@ -135,18 +135,18 @@ if ENV["MODEL_ADAPTER"] == "mongoid"
           obj2 = MongoidProject.create(:age => 40)
           @ability.can?(:read, obj2).should == false
         end
-        
+
         it "should handle instance not saved to database" do
           obj = MongoidProject.new(:title => 'Sir')
           @ability.can :read, MongoidProject, :title.in => ["Sir", "Madam"]
           @ability.can?(:read, obj).should == true
-          
+
           # accessible_by only returns saved records
           MongoidProject.accessible_by(@ability, :read).entries.should == []
-          
+
           obj2 = MongoidProject.new(:title => 'Lord')
           @ability.can?(:read, obj2).should == false
-        end          
+        end
       end
 
       it "should call where with matching ability conditions" do