diff --git a/.gitignore b/.gitignore
index 9b3a334..3be30be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /webmock-1.7.6.gem
 /webmock-1.7.10.gem
+/webmock-1.8.7.gem
diff --git a/rubygem-webmock.spec b/rubygem-webmock.spec
index f11c7b6..e714b63 100644
--- a/rubygem-webmock.spec
+++ b/rubygem-webmock.spec
@@ -4,23 +4,22 @@
 
 Summary: Library for stubbing HTTP requests in Ruby
 Name: rubygem-%{gem_name}
-Version: 1.7.10
+Version: 1.8.7
 Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://github.com/bblimke/webmock
 Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
+Patch0: webmock-%{version}-downgrade-dependencies.patch
 Requires: ruby(abi) = %{rubyabi}
-Requires: ruby(rubygems) 
-Requires: ruby 
-Requires: rubygem(addressable) => 2.2
+Requires: ruby(rubygems)
+Requires: rubygem(addressable) => 2.2.6
 Requires: rubygem(addressable) < 3
-Requires: rubygem(addressable) > 2.2.5
 Requires: rubygem(crack) >= 0.1.7
 BuildRequires: ruby(abi) = %{rubyabi}
-BuildRequires: ruby(rubygems) 
 BuildRequires: rubygems-devel
-BuildRequires: ruby 
+BuildRequires: ruby
+BuildRequires: rubygem(rspec)
 BuildArch: noarch
 Provides: rubygem(%{gem_name}) = %{version}
 
@@ -45,6 +44,10 @@ mkdir -p .%{gem_dir}
 gem install --local --install-dir .%{gem_dir} \
              --force %{SOURCE0}
 
+pushd .%{gem_dir}
+%patch0 -p1
+popd
+
 %build
 
 %install
@@ -64,21 +67,24 @@ popd
 %{gem_instdir}/Gemfile
 %{gem_instdir}/Rakefile
 %doc %{gem_instdir}/minitest
-%doc %{gem_instdir}/test
-%doc %{gem_instdir}/spec
-%doc %{gem_instdir}/%{gem_name}.gemspec
-%doc %{gem_instdir}/README.md
 %doc %{gem_instdir}/LICENSE
-%doc %{gem_instdir}/CHANGELOG.md
 %doc %{gem_instdir}/Guardfile
-%{gem_dir}/cache/%{gem_name}-%{version}.gem
-%{gem_dir}/specifications/%{gem_name}-%{version}.gemspec
+%exclude %{gem_cache}
+%{gem_spec}
 
 %files doc
-%doc %{gem_dir}/doc/%{gem_name}-%{version}
+%doc %{gem_docdir}
+%doc %{gem_instdir}/CHANGELOG.md
+%doc %{gem_instdir}/README.md
+%{gem_instdir}/%{gem_name}.gemspec
+%{gem_instdir}/test
+%{gem_instdir}/spec
 
 
 %changelog
+* Mon Jul 02 2012 Vít Ondruch <vondruch@redhat.com> - 1.8.7-1
+- Updated to webmock 1.8.7.
+
 * Mon Feb 13 2012 Mo Morsi <mmorsi@redhat.com> - 1.7.10-1
 - Update to latest upstream release
 - Build against ruby 1.9
diff --git a/sources b/sources
index 3d1d27d..ab84085 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-5ff10679f8e2865471fc9f9ae80dd2c5  webmock-1.7.6.gem
-5a2943d6f9da9e775f60bd6c8aa8012e  webmock-1.7.10.gem
+431254dc46b53222c5efef4dfd0e5c02  webmock-1.8.7.gem
diff --git a/webmock-1.8.7-downgrade-dependencies.patch b/webmock-1.8.7-downgrade-dependencies.patch
new file mode 100644
index 0000000..7047279
--- /dev/null
+++ b/webmock-1.8.7-downgrade-dependencies.patch
@@ -0,0 +1,30 @@
+--- a/specifications/webmock-1.8.7.gemspec
++++ b/specifications/webmock-1.8.7.gemspec
+@@ -19,7 +19,7 @@
+     s.specification_version = 3
+ 
+     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+-      s.add_runtime_dependency(%q<addressable>, [">= 2.2.7"])
++      s.add_runtime_dependency(%q<addressable>, [">= 2.2.6"])
+       s.add_runtime_dependency(%q<crack>, [">= 0.1.7"])
+       s.add_development_dependency(%q<rspec>, ["~> 2.10"])
+       s.add_development_dependency(%q<httpclient>, [">= 2.2.4"])
+@@ -31,7 +31,7 @@
+       s.add_development_dependency(%q<minitest>, [">= 2.2.2"])
+       s.add_development_dependency(%q<rdoc>, ["> 3.5.0"])
+     else
+-      s.add_dependency(%q<addressable>, [">= 2.2.7"])
++      s.add_dependency(%q<addressable>, [">= 2.2.6"])
+       s.add_dependency(%q<crack>, [">= 0.1.7"])
+       s.add_dependency(%q<rspec>, ["~> 2.10"])
+       s.add_dependency(%q<httpclient>, [">= 2.2.4"])
+@@ -44,7 +44,7 @@
+       s.add_dependency(%q<rdoc>, ["> 3.5.0"])
+     end
+   else
+-    s.add_dependency(%q<addressable>, [">= 2.2.7"])
++    s.add_dependency(%q<addressable>, [">= 2.2.6"])
+     s.add_dependency(%q<crack>, [">= 0.1.7"])
+     s.add_dependency(%q<rspec>, ["~> 2.10"])
+     s.add_dependency(%q<httpclient>, [">= 2.2.4"])
+