diff --git a/.gitignore b/.gitignore
index 26be770..7ca4585 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 thor-0.13.6.gem
 /thor-0.14.6.gem
 /thor-0.16.0.gem
+/thor-0.17.0.gem
diff --git a/rubygem-thor.spec b/rubygem-thor.spec
index 1a896a3..83f8d9e 100644
--- a/rubygem-thor.spec
+++ b/rubygem-thor.spec
@@ -1,26 +1,24 @@
 # Generated from thor-0.12.0.gem by gem2rpm -*- rpm-spec -*-
 %global gem_name thor
-%global rubyabi 1.9.1
 
 # There are not all test dependencies are available in RHEL.
 %global enable_test 0%{!?rhel:1}
 
 Summary: Scripting framework that replaces rake, sake and rubigen
 Name: rubygem-%{gem_name}
-Version: 0.16.0
-Release: 3%{?dist}
+Version: 0.17.0
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://whatisthor.com/
 Source0: http://rubygems.org/downloads/%{gem_name}-%{version}.gem
 Requires: ruby(rubygems)
-Requires: ruby(abi) = %{rubyabi}
+Requires: ruby(release)
 BuildRequires: rubygems-devel
-BuildRequires: ruby(abi) = %{rubyabi}
+BuildRequires: ruby(release)
 %if %{enable_test} > 0
 BuildRequires: rubygem(rspec)
 BuildRequires: rubygem(fakeweb)
-BuildRequires: rubygem(bundler)
 BuildRequires: git
 %endif
 BuildArch: noarch
@@ -41,13 +39,7 @@ This package contains documentation for %{name}.
 %prep
 %setup -q -c -T
 
-mkdir -p .%{gem_dir}
-gem install -V \
-  --local \
-  --install-dir .%{gem_dir} \
-  --bindir .%{_bindir} \
-  --force \
-  %{SOURCE0}
+%gem_install -n %{SOURCE0}
 
 %build
 
@@ -68,12 +60,16 @@ find %{buildroot}%{gem_instdir}/bin -type f | \
 %if %{enable_test} > 0
 %check
 pushd .%{gem_instdir}
+
+# Drop bundler dependency
+sed -i "s/require 'bundler'//" Thorfile
+
 # kill simplecov dependency
 sed -i '3,7d' spec/spec_helper.rb
 
 # This fixes on test failure due to encoding issues.
 # https://github.com/wycats/thor/issues/278
-sed -i '166 i\content.force_encoding "UTF-8"' spec/shell/basic_spec.rb
+sed -i '178 i\content.force_encoding "UTF-8"' spec/shell/basic_spec.rb
 
 rspec spec
 popd
@@ -101,6 +97,10 @@ popd
 %doc %{gem_docdir}
 
 %changelog
+* Mon Mar 04 2013 Josef Stribny <jstribny@redhat.com> - 0.17.0-1
+- Rebuild for https://fedoraproject.org/wiki/Features/Ruby_2.0.0
+- Update to Thor 0.17.0
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.16.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 8c5f047..16a7f97 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e8ddb0b47f3fbd4b84e1b387fb68c00d  thor-0.16.0.gem
+6e514e3d2fd771942898dd2725384ac0  thor-0.17.0.gem