diff --git a/rubygem-rdiscount.spec b/rubygem-rdiscount.spec
index 60b4582..e7e8421 100644
--- a/rubygem-rdiscount.spec
+++ b/rubygem-rdiscount.spec
@@ -3,7 +3,7 @@
 Summary: Fast Implementation of Gruber's Markdown in C
 Name: rubygem-%{gem_name}
 Version: 2.0.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Development/Languages
 License: ASL 1.1
 URL: http://github.com/rtomayko/rdiscount
@@ -39,10 +39,7 @@ This package contains Rakefile, test directory and documentation for
 %setup -q -c -T
 
 %build
-mkdir -p .%{gem_dir}
-export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
-gem install -V --local --install-dir $(pwd)/%{gem_dir} \
-            --force --rdoc %{SOURCE0}
+%gem_install -n %{SOURCE0}
 
 %install
 rm -rf %{buildroot}
@@ -57,9 +54,7 @@ rm -rf %{buildroot}%{gem_instdir}/ext
 mv %{buildroot}%{gem_libdir}/rdiscount.so %{buildroot}%{gem_extdir_mri}/lib/
 
 mkdir -p %{buildroot}/%{_bindir}
-mv %{buildroot}%{gem_dir}/bin/* %{buildroot}/%{_bindir}
-rmdir %{buildroot}%{gem_dir}/bin
-find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x
+mv .%{_bindir}/* %{buildroot}/%{_bindir}
 
 %clean
 rm -rf %{buildroot}
@@ -96,6 +91,9 @@ popd
 
 
 %changelog
+* Mon Mar 18 2013 Bohuslav Kabrda <bkabrda@redhat.com> - 2.0.7-5
+- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
+
 * Mon Mar 18 2013 Gerd Pokorra <gp@zimt.uni-siegen.de> - 2.0.7-4
 - Changed from ruby(abi) to ruby(release)
 - Changed from macro gem_extdir to gem_extdir_mri