diff --git a/rubygem-cloudservers.spec b/rubygem-cloudservers.spec
index 1ffd811..b183233 100644
--- a/rubygem-cloudservers.spec
+++ b/rubygem-cloudservers.spec
@@ -1,28 +1,26 @@
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global gemname cloudservers
-%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
-%global rubyabi 1.8
+%global gem_name cloudservers
+%global rubyabi 1.9.1
 
 Summary: A Ruby API to version 1.0 of the Rackspace Cloud Servers product
-Name: rubygem-%{gemname}
+Name: rubygem-%{gem_name}
 Version: 0.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Group: Development/Languages
 License: MIT
 URL: https://github.com/rackspace/ruby-cloudservers
-Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
-Requires: rubygems
+Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
+Requires: ruby(rubygems)
 Requires: ruby(abi) = %{rubyabi} 
 Requires: rubygem(mime-types)
 Requires: rubygem(json)
 BuildRequires: ruby(abi) = %{rubyabi} 
-BuildRequires: ruby(rubygems) 
-BuildRequires: rubygem(rake)
+BuildRequires: rubygems-devel
 BuildRequires: rubygem(mime-types)
 BuildRequires: rubygem(mocha)
 BuildRequires: rubygem(json)
+BuildRequires: rubygem(minitest)
 BuildArch: noarch
-Provides: rubygem(%{gemname}) = %{version}
+Provides: rubygem(%{gem_name}) = %{version}
 
 %package doc
 Summary: Documentation for %{name}
@@ -41,19 +39,19 @@ A Ruby API to version 1.0 of the Rackspace Cloud Servers product.
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{gemdir}
-gem install -V --local --install-dir %{buildroot}%{gemdir} \
+mkdir -p %{buildroot}%{gem_dir}
+gem install -V --local --install-dir %{buildroot}%{gem_dir} \
             --force --rdoc %{SOURCE0}
-find %{buildroot}/%{geminstdir} -type f -perm /g+wx -exec chmod -v g-w {} \;
-rm -f %{buildroot}/%{geminstdir}/.gitignore
-rm -f %{buildroot}/%{geminstdir}/Manifest
-rm -f %{buildroot}/%{geminstdir}/cloudservers.gemspec
-cd %{buildroot}/%{geminstdir}/
+find %{buildroot}/%{gem_instdir} -type f -perm /g+wx -exec chmod -v g-w {} \;
+rm -f %{buildroot}/%{gem_instdir}/.gitignore
+rm -f %{buildroot}/%{gem_instdir}/Manifest
+rm -f %{buildroot}/%{gem_instdir}/cloudservers.gemspec
+cd %{buildroot}/%{gem_instdir}/
 
 
 %check
-pushd %{buildroot}%{geminstdir}
-rake test --trace
+pushd %{buildroot}%{gem_instdir}
+testrb test/*_test.rb
 popd
 
 %clean
@@ -61,24 +59,27 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root, -)
-%dir %{geminstdir}
-%{geminstdir}/lib
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
-%doc %{geminstdir}/README.rdoc
-%doc %{geminstdir}/CHANGELOG
-%doc %{geminstdir}/COPYING
-%doc %{geminstdir}/VERSION
-%doc %{geminstdir}/TODO
+%dir %{gem_instdir}
+%{gem_libdir}
+%{gem_cache}
+%{gem_spec}
+%doc %{gem_instdir}/README.rdoc
+%doc %{gem_instdir}/CHANGELOG
+%doc %{gem_instdir}/COPYING
+%doc %{gem_instdir}/VERSION
+%doc %{gem_instdir}/TODO
 
 
 %files doc
 %defattr(-, root, root, -)
-%{geminstdir}/test
-%{geminstdir}/Rakefile
-%{gemdir}/doc/%{gemname}-%{version}
+%{gem_instdir}/test
+%{gem_instdir}/Rakefile
+%{gem_docdir}
 
 %changelog
+* Mon Feb 06 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 0.4.1-4
+- Rebuilt for Ruby 1.9.3.
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild