diff --git a/.gitignore b/.gitignore
index 273ff9d..efea01f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 webmock-1.9.0.gem/webmock-1.17.1.gem
+/webmock-1.21.0.gem
diff --git a/rubygem-webmock.spec b/rubygem-webmock.spec
index b3542ca..4db0f77 100644
--- a/rubygem-webmock.spec
+++ b/rubygem-webmock.spec
@@ -1,24 +1,28 @@
 # Generated from webmock-1.7.6.gem by gem2rpm -*- rpm-spec -*-
 %global gem_name webmock
 
-Summary: Library for stubbing HTTP requests in Ruby
 Name: rubygem-%{gem_name}
-Version: 1.17.1
-Release: 3%{?dist}
+Version: 1.21.0
+Release: 1%{?dist}
+Summary: Library for stubbing HTTP requests in Ruby
 Group: Development/Languages
 License: MIT
 URL: http://github.com/bblimke/webmock
-Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
-Requires: ruby(release)
-Requires: ruby(rubygems)
-Requires: rubygem(addressable) >= 2.2.7
-Requires: rubygem(crack) >= 0.3.2
+Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
 BuildRequires: ruby
+BuildRequires: rubygem(addressable)
+BuildRequires: rubygem(crack)
+BuildRequires: rubygem(curb)
+BuildRequires: rubygem(excon)
+BuildRequires: rubygem(httpclient)
+BuildRequires: rubygem(minitest)
+BuildRequires: rubygem(rack)
 BuildRequires: rubygem(rspec)
+BuildRequires: rubygem(test-unit)
+BuildRequires: rubygem(typhoeus)
 BuildArch: noarch
-Provides: rubygem(%{gem_name}) = %{version}
 
 %description
 WebMock allows stubbing HTTP requests and setting expectations on HTTP
@@ -32,8 +36,7 @@ Requires: %{name} = %{version}-%{release}
 BuildArch: noarch
 
 %description doc
-Documentation for %{name}
-
+Documentation for %{name}.
 
 %prep
 %setup -q -c -T
@@ -52,26 +55,45 @@ rm  .travis.yml .rspec-tm .gitignore .gemtest
 popd
 
 
+
+# Run the test suite
+%check
+pushd .%{gem_instdir}
+ruby -e 'Dir.glob "./minitest/**/*.rb", &method(:require)'
+ruby -e 'Dir.glob "./test/**/test_*.rb", &method(:require)'
+
+# rubygem-{patron,em-http-request,http} are not in Fedora yet.
+sed -i '/patron/ s/^/#/' spec/spec_helper.rb
+sed -i '/em-http/ s/^/#/' spec/spec_helper.rb
+
+# and we don't care about code quality, that's upstream business.
+rspec spec --exclude-pattern 'spec/{quality_spec.rb,acceptance/{patron,http_rb,em_http_request}/*}'
+
+popd
+
 %files
 %dir %{gem_instdir}
-%{gem_instdir}/lib
-%{gem_instdir}/Gemfile
-%{gem_instdir}/Rakefile
-%doc %{gem_instdir}/minitest
-%doc %{gem_instdir}/LICENSE
+%exclude %{gem_instdir}/.*
+%license %{gem_instdir}/LICENSE
+%{gem_libdir}
 %exclude %{gem_cache}
 %{gem_spec}
 
 %files doc
 %doc %{gem_docdir}
 %doc %{gem_instdir}/CHANGELOG.md
+%{gem_instdir}/Gemfile
 %doc %{gem_instdir}/README.md
-%{gem_instdir}/%{gem_name}.gemspec
-%{gem_instdir}/test
+%{gem_instdir}/Rakefile
+%{gem_instdir}/minitest
 %{gem_instdir}/spec
-
+%{gem_instdir}/test
+%{gem_instdir}/webmock.gemspec
 
 %changelog
+* Tue Sep 01 2015 Vít Ondruch <vondruch@redhat.com> - 1.21.0-1
+- Updated to webmock 1.21.0.
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index bdcf60f..0cc7b61 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-31385dfadb44316e62c76615e635083b  webmock-1.17.1.gem
+f04bf88419bf2b12efa0c1e93bc9f958  webmock-1.21.0.gem