diff --git a/lib/mparticle/api_client.rb b/lib/mparticle/api_client.rb
index d14657d..d068842 100644
--- a/lib/mparticle/api_client.rb
+++ b/lib/mparticle/api_client.rb
@@ -3,7 +3,7 @@
 require 'logger'
 require 'tempfile'
 require 'typhoeus'
-require 'uri'
+require 'addressable/uri'
 
 module MParticle
   class ApiClient
@@ -273,7 +273,7 @@ def sanitize_filename(filename)
     def build_request_url(path)
       # Add leading and trailing slashes to path
       path = "/#{path}".gsub(/\/+/, '/')
-      URI.encode(@config.base_url + path)
+      Addressable::URI.encode(@config.base_url + path)
     end
 
     # Builds the HTTP request body
diff --git a/lib/mparticle/configuration.rb b/lib/mparticle/configuration.rb
index 6e2d564..760af5e 100644
--- a/lib/mparticle/configuration.rb
+++ b/lib/mparticle/configuration.rb
@@ -1,4 +1,4 @@
-require 'uri'
+require 'addressable/uri'
 
 module MParticle
   class Configuration
@@ -136,7 +136,7 @@ def base_path=(base_path)
 
     def base_url
       url = "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
-      URI.encode(url)
+      Addressable::URI.encode(url)
     end
 
     # Gets Basic Auth token string
diff --git a/mparticle.gemspec b/mparticle.gemspec
index 481de42..181f69a 100644
--- a/mparticle.gemspec
+++ b/mparticle.gemspec
@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'typhoeus', '~> 1.0', '>= 1.0.1'
   s.add_runtime_dependency 'json', '~> 2.0', '>= 2.3.0'
+  s.add_runtime_dependency 'addressable', '~> 2.3', '>= 2.3.0'
 
   s.files         = `find *`.split("\n").uniq.sort.select{|f| !f.empty? }
   s.executables   = []