diff --git a/.gitignore b/.gitignore
index 861ba5c..0ef6965 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /addressable-2.3.6.gem
 /addressable-2.3.8.gem
 /addressable-2.5.2.gem
+/addressable-2.7.0.gem
diff --git a/addressable-2.5.2.gem b/addressable-2.5.2.gem
deleted file mode 100644
index 3e53ea0..0000000
Binary files a/addressable-2.5.2.gem and /dev/null differ
diff --git a/fix_addressable_tests.patch b/fix_addressable_tests.patch
deleted file mode 100644
index bd72cfb..0000000
--- a/fix_addressable_tests.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- spec/addressable/uri_spec_orig.rb
-+++ spec/addressable/uri_spec.rb
-@@ -401,9 +401,9 @@
-     expect(@uri.normalized_host).to eq("example.com")
-   end
- 
--  it "returns 'com' for #tld" do
--    expect(@uri.tld).to eq("com")
--  end
-+  # it "returns 'com' for #tld" do
-+  #   expect(@uri.tld).to eq("com")
-+  # end
- 
-   it "returns 'user:password@example.com:8080' for #authority" do
-     expect(@uri.authority).to eq("user:password@example.com:8080")
-@@ -2393,9 +2393,9 @@
-     expect(@uri.origin).to eq('http://example.com')
-   end
- 
--  it "should have a tld of 'com'" do
--    expect(@uri.tld).to eq('com')
--  end
-+  # it "should have a tld of 'com'" do
-+  #   expect(@uri.tld).to eq('com')
-+  # end
- end
- 
- describe Addressable::URI, "when parsed from " +
-@@ -2408,13 +2408,13 @@
-     expect(@uri.origin).to eq('http://www.example.co.uk')
-   end
- 
--  it "should have a tld of 'co.uk'" do
--    expect(@uri.tld).to eq('co.uk')
--  end
--
--  it "should have a domain of 'example.co.uk'" do
--    expect(@uri.domain).to eq('example.co.uk')
--  end
-+  # it "should have a tld of 'co.uk'" do
-+  #   expect(@uri.tld).to eq('co.uk')
-+  # end
-+
-+  # it "should have a domain of 'example.co.uk'" do
-+  #   expect(@uri.domain).to eq('example.co.uk')
-+  # end
- end
- 
- describe Addressable::URI, "when parsed from " +
-@@ -2427,13 +2427,13 @@
-     expect(@uri.origin).to eq('http://sub_domain.blogspot.com')
-   end
- 
--  it "should have a tld of 'com'" do
--    expect(@uri.tld).to eq('com')
--  end
--
--  it "should have a domain of 'blogspot.com'" do
--    expect(@uri.domain).to eq('blogspot.com')
--  end
-+  # it "should have a tld of 'com'" do
-+  #   expect(@uri.tld).to eq('com')
-+  # end
-+
-+  # it "should have a domain of 'blogspot.com'" do
-+  #   expect(@uri.domain).to eq('blogspot.com')
-+  # end
- end
- 
- describe Addressable::URI, "when parsed from " +
-
diff --git a/no-rack-mount.patch b/no-rack-mount.patch
deleted file mode 100644
index ea3c305..0000000
--- a/no-rack-mount.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- Gemfile
-+++ Gemfile
-@@ -14,13 +14,11 @@
- end
- 
- group :test, :development do
--  gem 'rake', '> 10.0', '< 12'
-+  gem 'rake', '> 10.0', '< 12.1'
-   gem 'simplecov', :require => false
-   gem 'coveralls', :require => false, :platforms => [
-     :ruby_20, :ruby_21, :ruby_22, :ruby_23
-   ]
--  # Used to test compatibility.
--  gem 'rack-mount', git: 'https://github.com/sporkmonger/rack-mount.git', require: 'rack/mount'
- 
-   if RUBY_VERSION.start_with?('2.0', '2.1')
-     gem 'rack', '< 2', :require => false
-
diff --git a/rubygem-addressable.spec b/rubygem-addressable.spec
index 995f4cd..592c347 100644
--- a/rubygem-addressable.spec
+++ b/rubygem-addressable.spec
@@ -2,8 +2,8 @@
 %global gem_name addressable
 
 Name: rubygem-%{gem_name}
-Version: 2.5.2
-Release: 6%{?dist}
+Version: 2.7.0
+Release: 1%{?dist}
 Summary: URI Implementation
 License: ASL 2.0
 URL: https://github.com/sporkmonger/addressable
@@ -13,22 +13,13 @@ BuildRequires: rubygems-devel
 BuildRequires: rubygem(bigdecimal)
 BuildRequires: rubygem(public_suffix)
 BuildRequires: rubygem(rspec-its)
-BuildRequires: rubygem(idn)
-#BuildRequires: rubygem(rspec)
-#BuildRequires: rubygem(launchy)
-#BuildRequires: rubygem(json_pure)
-#BuildRequires: rubygem(yard)
-#BuildRequires: rubygem(simplecov)
-#BuildRequires: rubygem(bundler)
-#BuildRequires: rubygem(rspec-core)
 BuildArch: noarch
-Patch0: no-rack-mount.patch
-Patch1: fix_addressable_tests.patch
 
 %description
-Addressable is a replacement for the URI implementation that is part of
-Ruby's standard library. It more closely conforms to the relevant RFCs and
-adds support for URI and URL templates.
+Addressable is an alternative implementation to the URI implementation that is
+part of Ruby's standard library. It is flexible, offers heuristic parsing, and
+additionally provides extensive support for IRIs and URI templates.
+
 
 %package doc
 Summary: Documentation for %{name}
@@ -39,20 +30,11 @@ BuildArch: noarch
 Documentation for %{name}.
 
 %prep
-gem unpack %{SOURCE0}
-
-%setup -q -D -T -n  %{gem_name}-%{version}
-
-gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
-
-# Revert f1d5855162c48d06eb1907871909d5859b9a7d3c (rack-mount)
-%patch0
-# Comment out failing tests
-%patch1
+%setup -q -n %{gem_name}-%{version}
 
 %build
 # Create the gem as gem install only works on a gem file
-gem build %{gem_name}.gemspec
+gem build ../%{gem_name}-%{version}.gemspec
 
 # %%gem_install compiles any C extensions and installs the gem into ./%%gem_dir
 # by default, so that we can move it into the buildroot in %%install
@@ -65,19 +47,20 @@ cp -a .%{gem_dir}/* \
 
 %check
 pushd .%{gem_instdir}
-# Manually revert f1d5855162c48d06eb1907871909d5859b9a7d3c
-rm spec/addressable/rack_mount_compat_spec.rb
-
 # Drop Bundler dependency.
 sed -i "/require 'bundler\/setup'/ s/^/#/" spec/spec_helper.rb
 
 # We don't care about code coverage.
 sed -i '/^begin$/,/^end$/ s/^/#/' spec/spec_helper.rb
 
-# Remove tests failing because of missing internet connection
-rm spec/addressable/net_http_compat_spec.rb
+# rack-mount was deprecated upstream and is not available in Fedora anymore.
+# https://github.com/sporkmonger/addressable/issues/382
+mv spec/addressable/rack_mount_compat_spec.rb{,.disabled}
+
+# Remove tests failing because of missing internet connection.
+mv spec/addressable/net_http_compat_spec.rb{,.disabled}
 
-rspec spec/
+LC_ALL=C.UTF-8 rspec spec/
 popd
 
 %files
@@ -98,6 +81,9 @@ popd
 %{gem_instdir}/spec
 
 %changelog
+* Tue Apr 07 2020 Vít Ondruch <vondruch@redhat.com> - 2.7.0-1
+- Update to Addressable 2.7.0.
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.2-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 5801951..2056f47 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (addressable-2.5.2.gem) = ddd5aeb4b241efa897a636fd85bd227bd5c6a8ae56129b6bbbdfaad85cdbb74e3d0db4bb6693f7df148b66f68ca1f557ac17a1fb0ea7698d25d883ab0b690bc4
+SHA512 (addressable-2.7.0.gem) = 4c438bbfa8874fdcf11eef1d1f7cceb1855ea85948daff13615a0af129d35f92cc918f4bd5bbe4cd6ebccc67a86fc582265f915dc39831ec64209de0bdeeb732