diff --git a/rubygem-gherkin.spec b/rubygem-gherkin.spec
index e12924f..cb2e780 100644
--- a/rubygem-gherkin.spec
+++ b/rubygem-gherkin.spec
@@ -1,10 +1,12 @@
 %global gem_name gherkin
-%global rubyabi 1.9.1
+
+# %%check section needs cucumber, however cucumber depends on gherkin.
+%{!?need_bootstrap:	%global	need_bootstrap	1}
 
 Summary: Fast Gherkin lexer/parser
 Name: rubygem-%{gem_name}
 Version: 2.11.6
-Release: 1%{?dist}
+Release: 1.1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://github.com/cucumber/gherkin
@@ -12,12 +14,14 @@ Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
 
 Patch1: gherkin-2.11.6-relax-json-dependency.patch
 
-Requires: ruby(abi) = %{rubyabi}
+Requires: ruby(release)
 Requires: ruby(rubygems)
 Requires: rubygem(json)
 BuildRequires: rubygems-devel
 BuildRequires: ruby-devel
+%if 0%{?need_bootstrap} < 1
 BuildRequires: rubygem(cucumber)
+%endif
 BuildRequires: rubygem(rspec)
 Provides: rubygem(%{gem_name}) = %{version}
 
@@ -35,9 +39,7 @@ A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
 
 
 %prep
-mkdir -p .%{gem_dir}
-gem install --local --install-dir .%{gem_dir} \
-            --force -V --rdoc %{SOURCE0}
+%gem_install -n %{SOURCE0}
 
 pushd .%{gem_dir}
 %patch1 -p0
@@ -76,6 +78,7 @@ chmod a-x %{buildroot}%{gem_instdir}/lib/gherkin/i18n.rb
 chmod a-x %{buildroot}%{gem_instdir}/tasks/ragel_task.rb
 chmod a-x %{buildroot}%{gem_instdir}/tasks/compile.rake
 
+%if 0%{?need_bootstrap} < 1
 %check
 pushd .%{gem_instdir}
 # use this gherkin, not the system one
@@ -91,6 +94,7 @@ cucumber | grep '16 failed'
 # run specs, 93 fail because of the reason mentioned above
 rspec spec | grep '280 examples, 93 failures'
 popd
+%endif
 
 %files
 %dir %{gem_instdir}
@@ -119,6 +123,10 @@ popd
 %{gem_instdir}/tasks
 
 %changelog
+* Wed Feb 20 2013 Vít Ondruch <vondruch@redhat.com> - 2.11.6-2
+- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
+- Add bootstrap code.
+
 * Mon Feb 18 2013 Bohuslav Kabrda <bkabrda@redhat.com> - 2.11.6-1
 - Updated to version 2.11.6.
 - Fixed wrong dates in changelog.