diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index e3de1949..30e4dd32 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,6 +1,12 @@
-== 2.1.1
+== 2.1.2
 
-Notes: https://github.com/plataformatec/devise/wiki/How-to:-upgrade-to-devise-2.1
+* Enhancements
+  * Handle backwards incompatibility between Rails 3.2.6 and Thor 0.15.x
+
+* bug fix
+  * Fix regression on strategy validation on previous release
+
+== 2.1.1 (yanked)
 
 * enhancements
   * `sign_out_all_scopes` now locks warden and does not allow new logins in the same action
diff --git a/Gemfile.lock b/Gemfile.lock
index 30c21c2e..43812a64 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    devise (2.1.1)
+    devise (2.1.2)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (~> 3.1)
diff --git a/lib/devise/version.rb b/lib/devise/version.rb
index e321eeb8..e5d6e9f6 100644
--- a/lib/devise/version.rb
+++ b/lib/devise/version.rb
@@ -1,3 +1,3 @@
 module Devise
-  VERSION = "2.1.1".freeze
+  VERSION = "2.1.2".freeze
 end
diff --git a/lib/generators/devise/views_generator.rb b/lib/generators/devise/views_generator.rb
index 641981aa..cf52b14a 100644
--- a/lib/generators/devise/views_generator.rb
+++ b/lib/generators/devise/views_generator.rb
@@ -11,6 +11,7 @@ module Devise
                          :desc => "The scope to copy views to"
 
         # Le sigh, ensure Thor won't handle opts as args
+        # It should be fixed in future Rails releases
         class_option :form_builder, :aliases => "-b"
         class_option :markerb