diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 103a123..fbe39c2 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,6 +1,36 @@
-== Next
+== 0.17.0
 
-* Mongoid 5 ready! [dblock]
+* Rails 5 ready!
+
+* Mongoid 5.0 support
+
+* Dropped Ruby 1.8 support
+
+* Dropped Mongoid 2.x support
+
+* Extracted Sinatra support to kaminari-sinatra gem
+
+* Extracted DataMapper support to kaminari-data_mapper gem
+
+* Extracted Mongoid support to kaminari-mongoid gem
+
+* Extracted MongoMapper support to kaminari-mongo_mapper gem
+
+* Deprecated Kaminari::PageScopeMethods#num_pages in favor of `total_pages`
+
+* Deprecated :num_pages option for `paginate` in favor of :total_pages
+
+* Fixed mangled params in pagination links on Rails 5 #766 [audionerd]
+
+* Fixed a bug where the range of the records displayed on the last page
+doesn't match #718 [danzanzini]
+
+== 0.16.3
+
+* Fixed a "stack level too deep" bug in mongoid #642 [bartes]
+
+* Fixed a bug that Kaminari possibly crashes when combined with other gems
+that define `inherited` method on model classes, such as aasm. #651 [zeitnot]
 
 == 0.16.2