diff --git a/rubygem-mustache.spec b/rubygem-mustache.spec
index d137bdf..1d06da0 100644
--- a/rubygem-mustache.spec
+++ b/rubygem-mustache.spec
@@ -1,25 +1,24 @@
-%global gemname mustache
+%global gem_name mustache
 
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
-%global rubyabi 1.8
+%global rubyabi 1.9.1
 
 Summary: Framework-agnostic way to render logic-free views
-Name: rubygem-%{gemname}
+Name: rubygem-%{gem_name}
 Version: 0.99.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://github.com/defunkt/mustache
-Source0: http://rubygems.org/downloads/%{gemname}-%{version}.gem
+Source0: http://rubygems.org/downloads/%{gem_name}-%{version}.gem
 Requires: ruby(abi) = %{rubyabi}
 Requires: ruby(rubygems)
 Requires: ruby
 BuildRequires: ruby(abi) = %{rubyabi}
-BuildRequires: ruby(rubygems)
+BuildRequires: rubygems-devel
 BuildRequires: ruby
+BuildRequires: rubygem(minitest)
 BuildArch: noarch
-Provides: rubygem(%{gemname}) = %{version}
+Provides: rubygem(%{gem_name}) = %{version}
 
 %description
 Think of Mustache as a replacement for your views.
@@ -37,58 +36,62 @@ Documentation for %{name}
 
 %prep
 %setup -q -c -T
-mkdir -p .%{gemdir}
-gem install --local --install-dir .%{gemdir} \
+mkdir -p .%{gem_dir}
+gem install --local --install-dir .%{gem_dir} \
             --bindir .%{_bindir} \
             --force %{SOURCE0}
 
 %build
 
 %install
-mkdir -p %{buildroot}%{gemdir}
-cp -a .%{gemdir}/* \
-        %{buildroot}%{gemdir}/
+mkdir -p %{buildroot}%{gem_dir}
+cp -a .%{gem_dir}/* \
+        %{buildroot}%{gem_dir}/
 
 mkdir -p %{buildroot}%{_bindir}
 cp -a .%{_bindir}/* \
         %{buildroot}%{_bindir}/
 
-find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
+find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x
 
 # Install man pages
 mkdir -p %{buildroot}%{_mandir}/man5
-cp -a .%{geminstdir}/man/mustache.5 %{buildroot}%{_mandir}/man5
+cp -a .%{gem_instdir}/man/mustache.5 %{buildroot}%{_mandir}/man5
 mkdir -p %{buildroot}%{_mandir}/man1
-cp -a .%{geminstdir}/man/mustache.1 %{buildroot}%{_mandir}/man1
+cp -a .%{gem_instdir}/man/mustache.1 %{buildroot}%{_mandir}/man1
 
 # Install documentation
-cp -a .%{geminstdir}/man/*.html .
+cp -a .%{gem_instdir}/man/*.html .
 
 %check
-pushd %{buildroot}/%{geminstdir}
+pushd %{buildroot}/%{gem_instdir}
+export LANG=en_US.utf8
 testrb -Ilib test/*_test.rb
 popd
 
 %files
-%dir %{geminstdir}
+%dir %{gem_instdir}
 %doc *.html
-%{geminstdir}/lib
-%{geminstdir}/bin
+%{gem_libdir}
+%{gem_instdir}/bin
 %{_bindir}/mustache
-%doc %{geminstdir}/README.md
-%doc %{geminstdir}/LICENSE
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%exclude %{gemdir}/specifications/%{gemname}-%{version}.gemspec
-%exclude %{geminstdir}/man
+%doc %{gem_instdir}/README.md
+%doc %{gem_instdir}/LICENSE
+%{gem_cache}
+%exclude %{gem_spec}
+%exclude %{gem_instdir}/man
 %doc %{_mandir}/man1/*
 %doc %{_mandir}/man5/*
 
 %files doc
-%{geminstdir}/Rakefile
-%doc %{gemdir}/doc/%{gemname}-%{version}
-%{geminstdir}/test
+%{gem_instdir}/Rakefile
+%doc %{gem_docdir}
+%{gem_instdir}/test
 
 %changelog
+* Fri Jan 20 2012 Vít Ondruch <vondruch@redhat.com> - 0.99.4-3
+- Rebuilt for Ruby 1.9.3.
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.99.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild