diff --git a/Gemfile b/Gemfile
index 9abc8a5d66..45deca8315 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,6 @@ gem 'bcrypt-ruby', '~> 3.0.0'
 gem 'jquery-rails', github: 'rails/jquery-rails'
 gem 'turbolinks'
 gem 'coffee-rails', '~> 4.0.0.beta1'
-gem 'thor', github: 'wycats/thor'
 
 # This needs to be with require false to avoid
 # it being automatically loaded by sprockets
diff --git a/railties/railties.gemspec b/railties/railties.gemspec
index 276cce3a77..45968052a8 100644
--- a/railties/railties.gemspec
+++ b/railties/railties.gemspec
@@ -27,5 +27,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'actionpack',    version
 
   s.add_dependency 'rake', '>= 0.8.7'
-  s.add_dependency 'thor', '>= 0.17.0', '< 2.0'
+  s.add_dependency 'thor', '>= 0.18.1', '< 2.0'
 end