diff --git a/.gitignore b/.gitignore
index a551f95..653be07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ mocha-0.9.7.gem
 /mocha-0.12.1.gem
 /mocha-0.13.1.gem
 /mocha-0.14.0.gem
+/mocha-1.1.0.gem
diff --git a/rubygem-mocha-0.14.0-test-helper-mocha-setup.patch b/rubygem-mocha-0.14.0-test-helper-mocha-setup.patch
deleted file mode 100644
index d0f795a..0000000
--- a/rubygem-mocha-0.14.0-test-helper-mocha-setup.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit e4a88348dde432201611292802537b590d6734ea
-Author: Ken Dreyer <ktdreyer@ktdreyer.com>
-Date:   Sat Jul 27 21:19:53 2013 -0600
-
-    require "mocha/setup" in test_helper
-    
-    We must require mocha/setup before referring to classes named "Mocha".
-
-diff --git a/test/test_helper.rb b/test/test_helper.rb
-index 092ac73..047288b 100644
---- a/test/test_helper.rb
-+++ b/test/test_helper.rb
-@@ -23,6 +23,7 @@ if defined?(::Minitest) || defined?(MiniTest)
-   rescue LoadError
-     MiniTest::Unit.autorun
-   end
-+  require 'mocha/setup'
-   class Mocha::TestCase < defined?(Minitest::Test) ? Minitest::Test : MiniTest::Unit::TestCase
-     def assert_nothing_raised(exception = StandardError)
-       yield
-@@ -37,6 +38,7 @@ if defined?(::Minitest) || defined?(MiniTest)
-   end
- else
-   require 'test/unit'
-+  require 'mocha/setup'
-   class Mocha::TestCase < Test::Unit::TestCase
-     def test_dummy
-       # Some versions (?) of Test::Unit try to run this base class as a test case
diff --git a/rubygem-mocha.spec b/rubygem-mocha.spec
index 330fa50..4f9118c 100644
--- a/rubygem-mocha.spec
+++ b/rubygem-mocha.spec
@@ -3,26 +3,19 @@
 
 Summary:        Mocking and stubbing library
 Name:           rubygem-%{gem_name}
-Version:        0.14.0
-Release:        2%{?dist}
+Version:        1.1.0
+Release:        1%{?dist}
 Group:          Development/Languages
-License:        MIT and Ruby
-URL:            http://mocha.rubyforge.org
-Source0:	http://rubygems.org/gems/%{gem_name}-%{version}.gem
-# Make the tests work outside of rake/bundler
-# https://github.com/freerange/mocha/pull/163
-Patch0:         rubygem-mocha-0.14.0-test-helper-mocha-setup.patch
-Requires:	ruby(release)
-Requires:	ruby(rubygems)
-Requires:	rubygem(metaclass)
-BuildRequires:	ruby(release)
+License:        MIT or Ruby or BSD
+URL:            http://gofreerange.com/mocha/docs
+Source0:        http://rubygems.org/gems/%{gem_name}-%{version}.gem
+BuildRequires:  ruby(release)
 BuildRequires:  rubygems-devel
-BuildRequires:	ruby
-BuildRequires:	rubygem(metaclass)
-BuildRequires:	rubygem(introspection)
-BuildRequires:	rubygem(minitest)
+BuildRequires:  ruby
+BuildRequires:  rubygem(metaclass)
+BuildRequires:  rubygem(introspection)
+BuildRequires:  rubygem(minitest)
 BuildArch:      noarch
-Provides:       rubygem(%{gem_name}) = %{version}
 
 %description
 Mocking and stubbing library with JMock/SchMock syntax, which allows mocking
@@ -42,10 +35,6 @@ This package contains documentation for %{name}.
 %setup -q -c -T
 %gem_install -n %{SOURCE0}
 
-pushd .%{gem_instdir}
-%patch0 -p1
-popd
-
 %build
 
 %install
@@ -54,7 +43,7 @@ cp -pa .%{gem_dir}/* \
         %{buildroot}%{gem_dir}/
 
 %check 
-pushd %{buildroot}%{gem_instdir}
+pushd .%{gem_instdir}
 # Each part of test suite must be run separately, otherwise the test suite fails.
 # https://github.com/freerange/mocha/issues/121
 ruby -e "Dir.glob('./test/{unit,acceptance}/**/*_test.rb').each {|t| require t}"
@@ -69,15 +58,16 @@ popd
 %doc %{gem_instdir}/MIT-LICENSE.md
 %doc %{gem_instdir}/RELEASE.md
 %dir %{gem_instdir}
+%{gem_instdir}/bin
 %{gem_libdir}
-%{gem_cache}
+%exclude %{gem_cache}
 %{gem_spec}
 
 %files doc
 %{gem_instdir}/Gemfile*
 %doc %{gem_docdir}
+%doc %{gem_instdir}/CONTRIBUTING.md
 %{gem_instdir}/Rakefile
-%{gem_instdir}/build-matrix.rb
 %{gem_instdir}/mocha.gemspec
 %{gem_instdir}/gemfiles/
 %{gem_instdir}/test/
@@ -85,6 +75,9 @@ popd
 
 
 %changelog
+* Mon Jul 07 2014 Vít Ondruch <vondruch@redhat.com> - 1.1.0-1
+- Update to Mocha 1.1.0.
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.14.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index b168639..8dcd9b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c2ab792c0a505b41999736510cae63cf  mocha-0.14.0.gem
+191449b906fcffca8526f1203028b8e2  mocha-1.1.0.gem