diff --git a/Gemfile b/Gemfile
index c9f0e31c..42cc6998 100755
--- a/Gemfile
+++ b/Gemfile
@@ -5,10 +5,6 @@ source :rubygems
 
 gemspec # Include gemspec dependencies
 
-# Devise 2.1 throws an error if devise-encryptable is present in gemspec only
-# TODO: Check Devise Code to remove that 'broken' existance test for devise-encryptable
-gem 'devise-encryptable'
-
 # The rest of the dependencies are for use when in the locomotive development environment
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 1e784fec..0aa2d497 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -329,7 +329,6 @@ DEPENDENCIES
   compass-rails
   cucumber-rails
   database_cleaner
-  devise-encryptable
   factory_girl_rails (~> 1.6.0)
   json_spec
   launchy
diff --git a/lib/locomotive.rb b/lib/locomotive.rb
index d8d3d46d..efe3674d 100644
--- a/lib/locomotive.rb
+++ b/lib/locomotive.rb
@@ -1,6 +1,7 @@
 require 'locomotive/version'
 require 'locomotive/core_ext'
 require 'locomotive/configuration'
+require 'locomotive/devise'
 require 'locomotive/logger'
 require 'locomotive/haml'
 require 'locomotive/formtastic'
diff --git a/lib/locomotive/devise.rb b/lib/locomotive/devise.rb
index 22ded327..53a01e38 100644
--- a/lib/locomotive/devise.rb
+++ b/lib/locomotive/devise.rb
@@ -1 +1,2 @@
 # patches for devise here
+require 'devise-encryptable'