diff --git a/rubygem-haml.spec b/rubygem-haml.spec
index f3080f8..63d599c 100644
--- a/rubygem-haml.spec
+++ b/rubygem-haml.spec
@@ -1,37 +1,35 @@
 # Generated from haml-2.2.14.gem by gem2rpm -*- rpm-spec -*-
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global gemname haml
-%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%global gem_name haml
 
 Summary: An elegant, structured XHTML/XML templating engine
-Name: rubygem-%{gemname}
+Name: rubygem-%{gem_name}
 Version: 3.1.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Group: Development/Languages
 License: MIT and WTFPL
 URL: http://haml-lang.com/
-Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
+Source0: http://rubygems.org/gems/%{gem_name}-%{version}.gem
 
 # interim fix for https://github.com/nex3/haml/issues/403
 Patch0: haml-issue-403-bugfix.patch
 
-Requires: rubygems
-Requires: ruby(abi) = 1.8
+Requires: ruby(rubygems)
+Requires: ruby(abi) = 1.9.1
 # for html2haml
 Requires: rubygem(hpricot)
 Requires: rubygem(yard) >= 0.5.3
 Requires: rubygem(maruku) >= 0.5.9
 Requires: rubygem(sass)
 
-BuildRequires: rubygems
-BuildRequires: ruby
+BuildRequires: rubygems-devel
 BuildRequires: rubygem(rails)
 BuildRequires: rubygem(hpricot)
 BuildRequires: rubygem(erubis)
 BuildRequires: rubygem(ruby_parser)
+BuildRequires: rubygem(minitest)
 
 BuildArch: noarch
-Provides: rubygem(%{gemname}) = %{version}
+Provides: rubygem(%{gem_name}) = %{version}
 
 %description
 Haml (HTML Abstraction Markup Language) is a layer on top of XHTML or XML
@@ -44,17 +42,17 @@ function as a stand-alone templating engine.
 
 %prep
 %setup -q -c -T
-%{__mkdir_p} .%{gemdir}
-gem install --local --install-dir .%{gemdir} --force -V --rdoc %{SOURCE0}
+%{__mkdir_p} .%{gem_dir}
+gem install --local --install-dir .%{gem_dir} --force -V --rdoc %{SOURCE0}
 
-pushd .%{geminstdir}
+pushd .%{gem_instdir}
 %patch0
 popd
 
 %build
 
 %check
-pushd %{buildroot}%{geminstdir}
+pushd %{buildroot}%{gem_instdir}
 # The following -path list is from Rakefile
 find * \
  -path 'test/*/*_test.rb' \
@@ -63,66 +61,69 @@ find * \
  -not -path 'test/haml/spec/*' | \
 while read f
 do
-  ruby $f
+  ruby -I. $f
 done
 popd
 
 %install
-mkdir -p %{buildroot}%{gemdir}
-mv .%{gemdir}/* %{buildroot}%{gemdir}
+mkdir -p %{buildroot}%{gem_dir}
+mv .%{gem_dir}/* %{buildroot}%{gem_dir}
 
 mkdir -p %{buildroot}/%{_bindir}
-mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
-rmdir %{buildroot}%{gemdir}/bin
-find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
+mv %{buildroot}%{gem_dir}/bin/* %{buildroot}/%{_bindir}
+rmdir %{buildroot}%{gem_dir}/bin
+find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x
 
-rm %{buildroot}%{geminstdir}/.yardopts
+rm %{buildroot}%{gem_instdir}/.yardopts
 
 # Fix anything executable that does not have a shebang
-for file in `find %{buildroot}/%{geminstdir} -type f -perm /a+x`; do
+for file in `find %{buildroot}/%{gem_instdir} -type f -perm /a+x`; do
     [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file
 done
 
 # Find files with a shebang that do not have executable permissions
-for file in `find %{buildroot}/%{geminstdir} -type f ! -perm /a+x -name "*.rb"`; do
+for file in `find %{buildroot}/%{gem_instdir} -type f ! -perm /a+x -name "*.rb"`; do
     [ ! -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 755 $file
 done
 
 # Find files that have non-standard-executable-perm
-find %{buildroot}/%{geminstdir} -type f -perm /g+wx -exec chmod -v g-w {} \;
+find %{buildroot}/%{gem_instdir} -type f -perm /g+wx -exec chmod -v g-w {} \;
 
 # Find files that are not readable
-find %{buildroot}/%{geminstdir} -type f ! -perm /go+r -exec chmod -v go+r {} \;
+find %{buildroot}/%{gem_instdir} -type f ! -perm /go+r -exec chmod -v go+r {} \;
 
 # Don't search env - use the expected ruby
-find %{buildroot}%{geminstdir}/bin -type f | \
+find %{buildroot}%{gem_instdir}/bin -type f | \
   xargs -n 1 sed -i -e 's"^#!/usr/bin/env ruby"#!/usr/bin/ruby"'
 
 %files
 %{_bindir}/haml
 %{_bindir}/html2haml
-%dir %{geminstdir}
-%{geminstdir}/Rakefile
-%{geminstdir}/bin
-%{geminstdir}/extra
-%{geminstdir}/init.rb
-%{geminstdir}/lib
-%{geminstdir}/rails
-%{geminstdir}/test
-%{geminstdir}/VERSION
-%{geminstdir}/VERSION_NAME
+%dir %{gem_instdir}
+%{gem_instdir}/Rakefile
+%{gem_instdir}/bin
+%{gem_instdir}/extra
+%{gem_instdir}/init.rb
+%{gem_libdir}
+%{gem_instdir}/rails
+%{gem_instdir}/test
+%{gem_instdir}/VERSION
+%{gem_instdir}/VERSION_NAME
 # No vendored libraries thanks
-%exclude %{geminstdir}/vendor
-%doc %{gemdir}/doc/%{gemname}-%{version}
-%doc %{geminstdir}/MIT-LICENSE
-%doc %{geminstdir}/README.md
-%doc %{geminstdir}/REVISION
-%doc %{geminstdir}/CONTRIBUTING
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
+%exclude %{gem_instdir}/vendor
+%doc %{gem_docdir}
+%doc %{gem_instdir}/MIT-LICENSE
+%doc %{gem_instdir}/README.md
+%doc %{gem_instdir}/REVISION
+%doc %{gem_instdir}/CONTRIBUTING
+%{gem_cache}
+%{gem_spec}
 
 
 %changelog
+* Wed Feb 01 2012 Bohuslav Kabrda <bkabrda@redhat.com> - 3.1.2-5
+- Rebuilt for Ruby 1.9.3.
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
@@ -171,7 +172,7 @@ find %{buildroot}%{geminstdir}/bin -type f | \
 - change %%define to %%global
 - change license to "MIT and WTFPL" (test/haml/spec/README.md)
 - add Requires on hpricot for html2haml
-- change %%gemdir to %%geminstdir where appropriate
+- change %%gem_dir to %%gem_instdir where appropriate
 
 * Wed Dec 02 2009 Michal Babej <mbabej@redhat.com> - 2.2.15-1
 - Update to new upstream release