diff --git a/Gemfile b/Gemfile
index 7a622cd34..265fc4e9d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -24,7 +24,7 @@ gem 'devise_lastseenable', '0.0.4'
 
 # Captcha
 
-gem 'galetahub-simple_captcha', '0.1.5', :require => 'simple_captcha'
+gem 'simple_captcha2', '0.2.1', :require => 'simple_captcha'
 
 # Background processing
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 1ec15636e..21598ae56 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -178,7 +178,6 @@ GEM
     fuubar (1.3.3)
       rspec (>= 2.14.0, < 3.1.0)
       ruby-progressbar (~> 1.4)
-    galetahub-simple_captcha (0.1.5)
     gherkin (2.12.2)
       multi_json (~> 1.3)
     gon (5.0.4)
@@ -409,6 +408,8 @@ GEM
       json
       redis (>= 3.0.6)
       redis-namespace (>= 1.3.1)
+    simple_captcha2 (0.2.1)
+      rails (>= 3.1)
     simple_oauth (0.2.0)
     sinatra (1.3.3)
       rack (~> 1.3, >= 1.3.6)
@@ -496,7 +497,6 @@ DEPENDENCIES
   foreigner (= 1.6.1)
   foreman (= 0.62)
   fuubar (= 1.3.3)
-  galetahub-simple_captcha (= 0.1.5)
   gon (= 5.0.4)
   guard-cucumber (= 1.4.1)
   guard-rspec (= 4.2.9)
@@ -542,6 +542,7 @@ DEPENDENCIES
   sass-rails (= 4.0.1)
   selenium-webdriver (= 2.42.0)
   sidekiq (= 2.17.7)
+  simple_captcha2 (= 0.2.1)
   sinatra (= 1.3.3)
   sinon-rails (= 1.9.0)
   spork (= 1.0.0rc4)