diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 69e00464..18cd106b 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,7 +1,19 @@
-== 2.0.1
+== 2.0.2
 
 Notes: https://github.com/plataformatec/devise/wiki/How-To:-Upgrade-to-Devise-2.0
 
+* enhancements
+  * Add devise_i18n_options to customize I18n message
+
+* bug fix
+  * Ensure Devise.available_router_name defaults to :main_app
+  * Set autocomplete to off for password on edit forms
+  * Better error messages in case a trackable model can't be saved
+  * Show a warning in case someone gives a pluralized name to devise generator
+  * Fix test behavior for rspec subject requests (by @sj26)
+
+== 2.0.1
+
 * enhancements
   * Improved error messages on deprecation warnings
   * Hide Devise's internal generators from `rails g` command
diff --git a/lib/devise/version.rb b/lib/devise/version.rb
index 0d1caa75..1b7cd489 100644
--- a/lib/devise/version.rb
+++ b/lib/devise/version.rb
@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "2.0.1".freeze
+  VERSION = "2.0.2".freeze
 end