diff --git a/oa-basic/oa-basic.gemspec b/oa-basic/oa-basic.gemspec
index c16adb6ef..edde41eb8 100644
--- a/oa-basic/oa-basic.gemspec
+++ b/oa-basic/oa-basic.gemspec
@@ -1,26 +1,25 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 require File.expand_path('../lib/omniauth/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_runtime_dependency 'oa-core', OmniAuth::Version::STRING
-  gem.add_runtime_dependency 'rest-client', '~> 1.6.0'
+  gem.add_dependency 'oa-core', OmniAuth::Version::STRING
+  gem.add_dependency 'rest-client', '~> 1.6.0'
   gem.add_development_dependency 'maruku', '~> 0.6'
-  gem.add_development_dependency 'simplecov', '~> 0.4'
   gem.add_development_dependency 'rack-test', '~> 0.5'
   gem.add_development_dependency 'rake', '~> 0.8'
   gem.add_development_dependency 'rspec', '~> 2.5'
+  gem.add_development_dependency 'simplecov', '~> 0.4'
   gem.add_development_dependency 'webmock', '~> 1.6'
   gem.add_development_dependency 'yard', '~> 0.7'
-  gem.name = 'oa-basic'
-  gem.version = OmniAuth::Version::STRING
+  gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober']
   gem.description = %q{HTTP Basic strategies for OmniAuth.}
-  gem.summary = gem.description
   gem.email = ['michael@intridea.com', 'sferik@gmail.com']
-  gem.homepage = 'http://github.com/intridea/omniauth'
-  gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober']
-  gem.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
   gem.files = `git ls-files`.split("\n")
-  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.homepage = 'http://github.com/intridea/omniauth'
+  gem.name = 'oa-basic'
   gem.require_paths = ['lib']
   gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if gem.respond_to? :required_rubygems_version=
+  gem.summary = gem.description
+  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.version = OmniAuth::Version::STRING
 end
diff --git a/oa-core/oa-core.gemspec b/oa-core/oa-core.gemspec
index ac9809a32..b2955a76d 100644
--- a/oa-core/oa-core.gemspec
+++ b/oa-core/oa-core.gemspec
@@ -1,23 +1,22 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 require File.expand_path('../lib/omniauth/version', __FILE__)
 
 Gem::Specification.new do |gem|
   gem.add_development_dependency 'maruku', '~> 0.6'
-  gem.add_development_dependency 'simplecov', '~> 0.4'
   gem.add_development_dependency 'rack-test', '~> 0.5'
   gem.add_development_dependency 'rake', '~> 0.8'
   gem.add_development_dependency 'rspec', '~> 2.5'
+  gem.add_development_dependency 'simplecov', '~> 0.4'
   gem.add_development_dependency 'yard', '~> 0.7'
-  gem.name = 'oa-core'
-  gem.version = OmniAuth::Version::STRING
+  gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober']
   gem.description = %q{Core strategies for OmniAuth.}
-  gem.summary = gem.description
   gem.email = ['michael@intridea.com', 'sferik@gmail.com']
-  gem.homepage = 'http://github.com/intridea/omniauth'
-  gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober']
-  gem.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
   gem.files = `git ls-files`.split("\n")
-  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.homepage = 'http://github.com/intridea/omniauth'
+  gem.name = 'oa-core'
   gem.require_paths = ['lib']
   gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if gem.respond_to? :required_rubygems_version=
+  gem.summary = gem.description
+  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.version = OmniAuth::Version::STRING
 end
diff --git a/oa-enterprise/oa-enterprise.gemspec b/oa-enterprise/oa-enterprise.gemspec
index 2b8073521..f28ba837c 100644
--- a/oa-enterprise/oa-enterprise.gemspec
+++ b/oa-enterprise/oa-enterprise.gemspec
@@ -1,30 +1,29 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 require File.expand_path('../lib/omniauth/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_runtime_dependency 'addressable', '~> 2.2.6'
-  gem.add_runtime_dependency 'nokogiri', '~> 1.5.0'
-  gem.add_runtime_dependency 'net-ldap', '~> 0.2.2'
-  gem.add_runtime_dependency 'oa-core', OmniAuth::Version::STRING
-  gem.add_runtime_dependency 'pyu-ruby-sasl', '~> 0.0.3.1'
-  gem.add_runtime_dependency 'rubyntlm', '~> 0.1.1'
+  gem.add_dependency 'addressable', '~> 2.2.6'
+  gem.add_dependency 'net-ldap', '~> 0.2.2'
+  gem.add_dependency 'nokogiri', '~> 1.5.0'
+  gem.add_dependency 'oa-core', OmniAuth::Version::STRING
+  gem.add_dependency 'pyu-ruby-sasl', '~> 0.0.3.1'
+  gem.add_dependency 'rubyntlm', '~> 0.1.1'
   gem.add_development_dependency 'maruku', '~> 0.6'
-  gem.add_development_dependency 'simplecov', '~> 0.4'
   gem.add_development_dependency 'rack-test', '~> 0.5'
   gem.add_development_dependency 'rake', '~> 0.8'
   gem.add_development_dependency 'rspec', '~> 2.5'
+  gem.add_development_dependency 'simplecov', '~> 0.4'
   gem.add_development_dependency 'webmock', '~> 1.6'
   gem.add_development_dependency 'yard', '~> 0.7'
-  gem.name = 'oa-enterprise'
-  gem.version = OmniAuth::Version::STRING
+  gem.authors = ['James A. Rosen', 'Ping Yu', 'Michael Bleigh', 'Erik Michaels-Ober']
   gem.description = %q{Enterprise strategies for OmniAuth.}
-  gem.summary = gem.description
   gem.email = ['james.a.rosen@gmail.com', 'ping@intridea.com', 'michael@intridea.com', 'sferik@gmail.com']
-  gem.homepage = 'http://github.com/intridea/omniauth'
-  gem.authors = ['James A. Rosen', 'Ping Yu', 'Michael Bleigh', 'Erik Michaels-Ober']
-  gem.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
   gem.files = `git ls-files`.split("\n")
-  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.homepage = 'http://github.com/intridea/omniauth'
+  gem.name = 'oa-enterprise'
   gem.require_paths = ['lib']
   gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if gem.respond_to? :required_rubygems_version=
+  gem.summary = gem.description
+  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.version = OmniAuth::Version::STRING
 end
diff --git a/oa-more/oa-more.gemspec b/oa-more/oa-more.gemspec
index 4f955bf57..15410d553 100644
--- a/oa-more/oa-more.gemspec
+++ b/oa-more/oa-more.gemspec
@@ -1,28 +1,27 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 require File.expand_path('../lib/omniauth/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_runtime_dependency 'multi_json',   '~> 1.0.0'
-  gem.add_runtime_dependency 'oa-core', OmniAuth::Version::STRING
-  gem.add_runtime_dependency 'rest-client',  '~> 1.6.0'
+  gem.add_dependency 'multi_json',   '~> 1.0.0'
+  gem.add_dependency 'oa-core', OmniAuth::Version::STRING
+  gem.add_dependency 'rest-client',  '~> 1.6.0'
   gem.add_development_dependency 'json_pure', '~> 1.5'
   gem.add_development_dependency 'maruku', '~> 0.6'
-  gem.add_development_dependency 'rake', '~> 0.8'
   gem.add_development_dependency 'rack-test', '~> 0.5'
+  gem.add_development_dependency 'rake', '~> 0.8'
   gem.add_development_dependency 'rspec', '~> 2.5'
   gem.add_development_dependency 'simplecov', '~> 0.4'
   gem.add_development_dependency 'webmock', '~> 1.6'
   gem.add_development_dependency 'yard', '~> 0.7'
-  gem.name = 'oa-more'
-  gem.version = OmniAuth::Version::STRING
+  gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober']
   gem.description = %q{Additional strategies for OmniAuth.}
-  gem.summary = gem.description
   gem.email = 'michael@intridea.com'
-  gem.homepage = 'http://github.com/intridea/omniauth'
-  gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober']
-  gem.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
   gem.files = `git ls-files`.split("\n")
-  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.homepage = 'http://github.com/intridea/omniauth'
+  gem.name = 'oa-more'
   gem.require_paths = ['lib']
   gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if gem.respond_to? :required_rubygems_version=
+  gem.summary = gem.description
+  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.version = OmniAuth::Version::STRING
 end
diff --git a/oa-oauth/oa-oauth.gemspec b/oa-oauth/oa-oauth.gemspec
index 068cac63a..12b708e52 100644
--- a/oa-oauth/oa-oauth.gemspec
+++ b/oa-oauth/oa-oauth.gemspec
@@ -1,32 +1,31 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 require File.expand_path('../lib/omniauth/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_runtime_dependency 'faraday', '~> 0.7.3'
-  gem.add_runtime_dependency 'multi_json', '~> 1.0.0'
-  gem.add_runtime_dependency 'multi_xml', '~> 0.2.2'
-  gem.add_runtime_dependency 'oa-core', OmniAuth::Version::STRING
-  gem.add_runtime_dependency 'oauth', '~> 0.4.0'
-  gem.add_runtime_dependency 'oauth2', '~> 0.5.0'
+  gem.add_dependency 'faraday', '~> 0.7.3'
+  gem.add_dependency 'multi_json', '~> 1.0.0'
+  gem.add_dependency 'multi_xml', '~> 0.2.2'
+  gem.add_dependency 'oa-core', OmniAuth::Version::STRING
+  gem.add_dependency 'oauth', '~> 0.4.0'
+  gem.add_dependency 'oauth2', '~> 0.5.0'
   gem.add_development_dependency 'evernote', '~> 1.0'
   gem.add_development_dependency 'maruku', '~> 0.6'
   gem.add_development_dependency 'rack-test', '~> 0.5'
   gem.add_development_dependency 'rake', '~> 0.8'
   gem.add_development_dependency 'rspec', '~> 2.5'
   gem.add_development_dependency 'simplecov', '~> 0.4'
+  gem.add_development_dependency 'vcr', '~> 1.10'
   gem.add_development_dependency 'webmock', '~> 1.6'
   gem.add_development_dependency 'yard', '~> 0.7'
-  gem.add_development_dependency 'vcr', '~> 1.10'
-  gem.name = 'oa-oauth'
-  gem.version = OmniAuth::Version::STRING
+  gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober']
   gem.description = %q{OAuth strategies for OmniAuth.}
-  gem.summary = gem.description
   gem.email = ['michael@intridea.com', 'sferik@gmail.com']
-  gem.homepage = 'http://github.com/intridea/omniauth'
-  gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober']
-  gem.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
   gem.files = `git ls-files`.split("\n")
-  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.homepage = 'http://github.com/intridea/omniauth'
+  gem.name = 'oa-oauth'
   gem.require_paths = ['lib']
   gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if gem.respond_to? :required_rubygems_version=
+  gem.summary = gem.description
+  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.version = OmniAuth::Version::STRING
 end
diff --git a/oa-openid/oa-openid.gemspec b/oa-openid/oa-openid.gemspec
index a751c14cf..9b7b51a4a 100644
--- a/oa-openid/oa-openid.gemspec
+++ b/oa-openid/oa-openid.gemspec
@@ -1,10 +1,10 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 require File.expand_path('../lib/omniauth/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_runtime_dependency 'oa-core', OmniAuth::Version::STRING
-  gem.add_runtime_dependency 'rack-openid', '~> 1.3.1'
-  gem.add_runtime_dependency 'ruby-openid-apps-discovery', '~> 1.2.0'
+  gem.add_dependency 'oa-core', OmniAuth::Version::STRING
+  gem.add_dependency 'rack-openid', '~> 1.3.1'
+  gem.add_dependency 'ruby-openid-apps-discovery', '~> 1.2.0'
   gem.add_development_dependency 'maruku', '~> 0.6'
   gem.add_development_dependency 'rack-test', '~> 0.5'
   gem.add_development_dependency 'rake', '~> 0.8'
@@ -12,16 +12,15 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'simplecov', '~> 0.4'
   gem.add_development_dependency 'webmock', '~> 1.6'
   gem.add_development_dependency 'yard', '~> 0.7'
-  gem.name = 'oa-openid'
-  gem.version = OmniAuth::Version::STRING
+  gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober']
   gem.description = %q{OpenID strategies for OmniAuth.}
-  gem.summary = gem.description
   gem.email = ['michael@intridea.com', 'sferik@gmail.com']
-  gem.homepage = 'http://github.com/intridea/omniauth'
-  gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober']
-  gem.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
   gem.files = `git ls-files`.split("\n")
-  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.homepage = 'http://github.com/intridea/omniauth'
+  gem.name = 'oa-openid'
   gem.require_paths = ['lib']
   gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if gem.respond_to? :required_rubygems_version=
+  gem.summary = gem.description
+  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.version = OmniAuth::Version::STRING
 end
diff --git a/omniauth.gemspec b/omniauth.gemspec
index 3e0521f1c..2efdc5e90 100644
--- a/omniauth.gemspec
+++ b/omniauth.gemspec
@@ -1,9 +1,9 @@
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
 require File.expand_path('../lib/omniauth/version', __FILE__)
 
 Gem::Specification.new do |gem|
   %w(oa-basic oa-enterprise oa-core oa-more oa-oauth oa-openid).each do |subgem|
-    gem.add_runtime_dependency subgem, OmniAuth::Version::STRING
+    gem.add_dependency subgem, OmniAuth::Version::STRING
   end
   gem.authors = ['Michael Bleigh', 'Erik Michaels-Ober']
   gem.description = %q{OmniAuth is an authentication framework that that separates the concept of authentiation from the concept of identity, providing simple hooks for any application to have one or multiple authentication providers for a user.}