diff --git a/lib/omniauth/amazon/version.rb b/lib/omniauth/amazon/version.rb
index ba6a0d1..c85cc72 100644
--- a/lib/omniauth/amazon/version.rb
+++ b/lib/omniauth/amazon/version.rb
@@ -1,5 +1,5 @@
 module OmniAuth
   module Amazon
-    VERSION = "1.0.1"
+    VERSION = "2.0.0"
   end
 end
diff --git a/lib/omniauth/strategies/amazon.rb b/lib/omniauth/strategies/amazon.rb
index 2af651b..42f409c 100644
--- a/lib/omniauth/strategies/amazon.rb
+++ b/lib/omniauth/strategies/amazon.rb
@@ -59,7 +59,7 @@ def raw_info
       end
 
       def callback_url
-        full_host + script_name + callback_path
+        full_host + callback_path
       end
     end
   end
diff --git a/omniauth-amazon.gemspec b/omniauth-amazon.gemspec
index fe6c7a1..ee00e54 100644
--- a/omniauth-amazon.gemspec
+++ b/omniauth-amazon.gemspec
@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = OmniAuth::Amazon::VERSION
   spec.authors       = ["Stafford Brunk"]
   spec.email         = ["stafford.brunk@gmail.com"]
-  spec.description   = %q{Login with Amazon OAuth2 strategy for OmniAuth 1.0}
-  spec.summary       = %q{Login with Amazon OAuth2 strategy for OmniAuth 1.0}
+  spec.description   = %q{Login with Amazon OAuth2 strategy for OmniAuth 2.0}
+  spec.summary       = %q{Login with Amazon OAuth2 strategy for OmniAuth 2.0}
   spec.homepage      = "https://github.com/wingrunr21/omniauth-amazon"
   spec.license       = "MIT"
 
@@ -18,12 +18,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'omniauth', '~> 1.0'
+  spec.add_dependency 'omniauth', '~> 2.0'
   spec.add_dependency 'omniauth-oauth2', '~> 1.1'
+  spec.add_dependency 'multi_json'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency 'rspec', '~> 2.13'
+  spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'simplecov'
   spec.add_development_dependency 'webmock'
diff --git a/spec/omniauth/strategies/amazon_spec.rb b/spec/omniauth/strategies/amazon_spec.rb
index a2a518e..812f007 100644
--- a/spec/omniauth/strategies/amazon_spec.rb
+++ b/spec/omniauth/strategies/amazon_spec.rb
@@ -2,9 +2,7 @@
 
 describe OmniAuth::Strategies::Amazon do
   subject do
-    strategy = OmniAuth::Strategies::Amazon.new(nil, @options || {})
-    strategy.stub(:session) { {  } }
-    strategy
+    OmniAuth::Strategies::Amazon.new(nil, @options || {})
   end
 
   describe '#client' do