diff --git a/rubygem-mustache.spec b/rubygem-mustache.spec
index 501aedb..b92731c 100644
--- a/rubygem-mustache.spec
+++ b/rubygem-mustache.spec
@@ -1,7 +1,6 @@
 %global gem_name mustache
 
 %if 0%{?rhel} <= 6 && 0%{?fedora} <= 16
-%global rubyabi 1.8
 
 %if 0%{?rhel}
 %global gem_dir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
@@ -13,14 +12,13 @@
 %endif
 
 %else
-%global rubyabi 1.9.1
 %endif
 
 
 Summary: Framework-agnostic way to render logic-free views
 Name: rubygem-%{gem_name}
 Version: 0.99.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://github.com/defunkt/mustache
@@ -29,10 +27,10 @@ Source0: http://rubygems.org/downloads/%{gem_name}-%{version}.gem
 # https://bugzilla.redhat.com/show_bug.cgi?id=859025
 # https://github.com/defunkt/mustache/pull/116
 Patch0: mustache-0.99.4-fix-mustache-executable-for-ruby193.patch
-Requires: ruby(abi) = %{rubyabi}
+Requires: ruby(release)
 Requires: ruby(rubygems)
 Requires: ruby
-BuildRequires: ruby(abi) = %{rubyabi}
+BuildRequires: ruby(release)
 %if 0%{?fedora}
 BuildRequires: rubygems-devel
 %else
@@ -59,10 +57,7 @@ Documentation for %{name}
 
 %prep
 %setup -q -c -T
-mkdir -p .%{gem_dir}
-gem install --local --install-dir .%{gem_dir} \
-            --bindir .%{_bindir} \
-            --force %{SOURCE0}
+%gem_install -n %{SOURCE0}
 
 pushd .%{gem_instdir}
 %patch0 -p1
@@ -116,6 +111,9 @@ popd
 %{gem_instdir}/test
 
 %changelog
+* Mon Mar 04 2013 Vít Ondruch <vondruch@redhat.com> - 0.99.4-8
+- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.99.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild