diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 9d69ded2..86e6829d 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -15,6 +15,7 @@
   * Allow to specify haml in devise_views.
   * Compatibility with Datamapper and Mongoid.
   * Allow :unlock_strategy to be :none.
+  * Make config.devise available on config/application.rb.
 
 * bug fix
   * Do not allow unlockable strategies based on time to access a controller.
diff --git a/lib/devise/rails.rb b/lib/devise/rails.rb
index dc849a61..c1e140cf 100644
--- a/lib/devise/rails.rb
+++ b/lib/devise/rails.rb
@@ -3,6 +3,8 @@ require 'devise/rails/warden_compat'
 
 module Devise
   class Engine < ::Rails::Engine
+    config.devise = Devise
+
     initializer "devise.add_middleware" do |app|
       app.config.middleware.use Warden::Manager do |config|
         Devise.configure_warden(config)