diff --git a/rubygem-xmlparser.spec b/rubygem-xmlparser.spec
index 2153b9f..95a96af 100644
--- a/rubygem-xmlparser.spec
+++ b/rubygem-xmlparser.spec
@@ -1,15 +1,9 @@
 %global gem_name xmlparser
 
-%if 0%{?fedora} >= 17
-%global rubyabi 1.9.1
-%else
-%global rubyabi 1.8
-%endif
-
 Summary: Ruby bindings to the Expat XML parsing library
 Name: rubygem-%{gem_name}
 Version: 0.7.2.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: Development/Languages
 # src/lib/xml/xpath.rb is GPLv2+
 # src/ext/encoding.h and the functions of encoding map are GPLv2+ or Artistic
@@ -21,10 +15,10 @@ Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: ruby
 Requires: ruby(rubygems)
-Requires: ruby(abi) = %{rubyabi}
+Requires: ruby(release)
 BuildRequires: ruby
 BuildRequires: ruby(rubygems)
-BuildRequires: ruby(abi) = %{rubyabi}
+BuildRequires: ruby(release)
 BuildRequires: ruby-devel
 BuildRequires: rubygems-devel
 BuildRequires: rubygem(rake)
@@ -40,9 +34,7 @@ Ruby bindings to the Expat XML parsing library.
 cp %{SOURCE0} %{gem_name}-%{version}.gem
 
 %build
-mkdir -p .%{gem_dir}
-export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
-gem install -V --local --install-dir ./%{gem_dir} --bindir ./%{_bindir} --no-rdoc --no-ri --force %{gem_name}-%{version}.gem
+%gem_install
 
 %install
 rm -rf %{buildroot}
@@ -53,8 +45,8 @@ cp -rp .%{gem_dir}/* %{buildroot}%{gem_dir}/
 rm -rf %{buildroot}%{gem_instdir}/ext
 
 # install externals
-mkdir -p %{buildroot}%{gem_extdir}/lib
-mv %{buildroot}%{gem_instdir}/lib/*.so %{buildroot}%{gem_extdir}/lib
+mkdir -p %{buildroot}%{gem_extdir_mri}/lib
+mv %{buildroot}%{gem_instdir}/lib/*.so %{buildroot}%{gem_extdir_mri}/lib
 
 %clean
 rm -rf %{buildroot}
@@ -62,14 +54,18 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root, -)
-%{gem_extdir}/lib/xmlparser.so
+%{gem_extdir_mri}/lib/xmlparser.so
 %dir %{gem_instdir}/
 %doc %{gem_instdir}/[A-Z]*
+%doc %{gem_docdir}
 %{gem_instdir}/[a-z]*
 %exclude %{gem_cache}
 %{gem_spec}
 
 %changelog
+* Mon Mar 18 2013 Bohuslav Kabrda <bkabrda@redhat.com> - 0.7.2.1-6
+- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.2.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild