diff --git a/lib/devise/models/authenticable.rb b/lib/devise/models/authenticable.rb
index d70a0f81..65250c6f 100644
--- a/lib/devise/models/authenticable.rb
+++ b/lib/devise/models/authenticable.rb
@@ -2,9 +2,11 @@ module Devise
   module Authenticable
     require 'digest/sha1'
 
+    mattr_accessor :pepper, :stretches
     # Pepper for encrypting password
-    mattr_accessor :pepper
     self.pepper = '23c64df433d9b08e464db5c05d1e6202dd2823f0'
+    # Encrypt password as many times as possible
+    self.stretches = 10
 
     def self.included(base)
       base.class_eval do
@@ -52,7 +54,9 @@ module Devise
       # incoming password
       #
       def password_digest(password_to_digest)
-        secure_digest(password_salt, @@pepper, password_to_digest)
+        digest = pepper
+        stretches.times { digest = secure_digest(password_salt, digest, password_to_digest, pepper)}
+        digest
       end
 
       # Generate a SHA1 digest joining args. Generated token is something like
diff --git a/test/models/authenticable_test.rb b/test/models/authenticable_test.rb
index a14de8b6..c8ab9980 100644
--- a/test/models/authenticable_test.rb
+++ b/test/models/authenticable_test.rb
@@ -92,8 +92,9 @@ class AuthenticableTest < ActiveSupport::TestCase
 
   test 'should encrypt password using a sha1 hash' do
     Devise::Authenticable.pepper = 'pepper'
+    Devise::Authenticable.stretches = 1
     user = create_user
-    expected_password = ::Digest::SHA1.hexdigest("--#{user.password_salt}--pepper--123456--")
+    expected_password = ::Digest::SHA1.hexdigest("--#{user.password_salt}--pepper--123456--pepper--")
     assert_equal expected_password, user.encrypted_password
   end