diff --git a/Gemfile b/Gemfile
index 290739ccb6..f9058224d0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,7 @@ gem 'acts-as-taggable-on', '~> 3.5.0'
 gem 'airbrake', '< 5.0' # requires newer errbit
 gem 'awesome_nested_set', '< 3.1.0' # requires ruby 2.0
 gem 'axlsx', '>= 3.0.0.pre'
-gem 'bcrypt-ruby'
+gem 'bcrypt'
 gem 'bleib', '~> 0.0.10'
 gem 'cancancan', '< 1.13.0' # requires ruby 2.0
 gem 'carrierwave', '< 0.11.1' # uses 2.0 for testing (no explicit requirement, yet)
@@ -24,7 +24,7 @@ gem 'country_select'
 gem 'daemons'
 gem 'dalli'
 gem 'delayed_job_active_record'
-gem 'devise', '>= 4.7.1'
+gem 'devise'
 gem 'doorkeeper'
 gem 'doorkeeper-i18n'
 gem 'draper'
diff --git a/Gemfile.lock b/Gemfile.lock
index ff88f9bd6d..11fa07cf99 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -75,8 +75,6 @@ GEM
       nokogiri (~> 1.8, >= 1.8.2)
       rubyzip (~> 1.2, >= 1.2.1)
     bcrypt (3.1.12)
-    bcrypt-ruby (3.1.5)
-      bcrypt (>= 3.1.3)
     better_errors (2.5.1)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
@@ -552,7 +550,7 @@ DEPENDENCIES
   awesome_nested_set (< 3.1.0)
   awesome_print
   axlsx (>= 3.0.0.pre)
-  bcrypt-ruby
+  bcrypt
   better_errors
   binding_of_caller
   bleib (~> 0.0.10)