diff --git a/.yardopts b/.yardopts
new file mode 100644
index 0000000000..263469cd37
--- /dev/null
+++ b/.yardopts
@@ -0,0 +1 @@
+- CHANGELOG*
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
new file mode 100644
index 0000000000..9c47101282
--- /dev/null
+++ b/CHANGELOG.rdoc
@@ -0,0 +1,27 @@
+= Overview
+
+For instructions on upgrading to newer versions, visit {mongoid.org}[http://mongoid.org/docs/upgrading.html].
+
+== 2.1.0 (unreleased)
+
+=== Major Changes
+
+* Traditional slave support has been removed from Mongoid.
+  Replica sets should be used in place of traditional master and slave setups.
+
+=== New Features
+
+* #587 Added order preference to many and many to many associations (Gregory Man)
+* Added ability to chain order_by statements (Gregory Man)
+* #961 Allow arbitrary Mongo::Connection options to pass through Mongoid::Config::Database object. (Morgan Nelson)
+* Enable autosave for many to many references. (Dave Krupinski)
+
+=== Bug Fixes
+
+* #974 Fix attribute_present? to work correctly then attribute value is false, thanks to @nickhoffman (Gregory Man)
+* #960 create indexes rake task is not recognizing a lot of mongoid models because it has problems guessing their model names from filenames (adyard)
+* #874 Deleting from a M-M reference is one-sided (nickhoffman, davekrupinski)
+* Replace deprecated class_inheritable_hash dropped in Rails 3.1+ (Konstantin Shabanov)
+* Fix inconsistent state when replacing an entire many to many relation
+* Don't clobber inheritable attributes when adding subclass field inheritance (Dave Krupinski)
+* #914 Querying embedded documents with '$or' selector (Max Golovnia)
diff --git a/Rakefile b/Rakefile
index 83f787a770..3aca27a77e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -45,6 +45,7 @@ RDoc::Task.new do |rdoc|
   rdoc.rdoc_dir = "rdoc"
   rdoc.title = "mongoid #{Mongoid::VERSION}"
   rdoc.rdoc_files.include("README*")
+  rdoc.rdoc_files.include("CHANGELOG*")
   rdoc.rdoc_files.include("lib/**/*.rb")
 end