diff --git a/.gitignore b/.gitignore
index 6da8137..5fd9793 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ haml-3.1.7.gem/haml-4.0.5.gem
 /haml-4.0.7.gem
 /haml-5.0.1-tests.tgz
 /haml-5.0.1.gem
+/haml-5.0.4-tests.tgz
+/haml-5.0.4.gem
diff --git a/rubygem-haml.spec b/rubygem-haml.spec
index 9d8ec22..4aa0563 100644
--- a/rubygem-haml.spec
+++ b/rubygem-haml.spec
@@ -2,14 +2,14 @@
 %global gem_name haml
 
 Name: rubygem-%{gem_name}
-Version: 5.0.1
-Release: 4%{?dist}
+Version: 5.0.4
+Release: 1%{?dist}
 Summary: An elegant, structured (X)HTML/XML templating engine
 License: MIT and WTFPL
 URL: http://haml.info/
 Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
 # git clone https://github.com/haml/haml.git && cd haml
-# git checkout v5.0.1 && tar czvf haml-5.0.1-tests.tgz test/
+# git checkout v5.0.4 && tar czvf haml-5.0.4-tests.tgz test/
 Source1: %{gem_name}-%{version}-tests.tgz
 BuildRequires: ruby(release)
 BuildRequires: rubygems-devel
@@ -38,14 +38,10 @@ BuildArch: noarch
 Documentation for %{name}.
 
 %prep
-gem unpack %{SOURCE0}
-
-%setup -q -D -T -n  %{gem_name}-%{version}
-
-gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
+%setup -q -n %{gem_name}-%{version} -b 1
 
 %build
-gem build %{gem_name}.gemspec
+gem build ../%{gem_name}-%{version}.gemspec
 
 %gem_install
 
@@ -63,11 +59,11 @@ find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x
 
 %check
 pushd .%{gem_instdir}
-# Move test into the place.
-tar xzvf %{SOURCE1}
+# Link test suite into the place.
+ln -s %{_builddir}/test test
 
 # Get rid of Bundler.
-sed -i '/bundler/ s/^/#/' test/test_helper.rb
+sed -i '/[bB]undler/ s/^/#/' test/test_helper.rb
 
 # options_test.rb must be executed in isolation in order to prevent load
 # order issues.
@@ -82,8 +78,8 @@ popd
 %exclude %{gem_instdir}/.*
 %license %{gem_instdir}/MIT-LICENSE
 %{gem_instdir}/bin
-%exclude %{gem_instdir}/haml.gemspec
 %{gem_libdir}
+%exclude %{gem_libdir}/haml/.gitattributes
 %exclude %{gem_cache}
 %{gem_spec}
 
@@ -97,10 +93,14 @@ popd
 %{gem_instdir}/Rakefile
 %doc %{gem_instdir}/TODO
 %{gem_instdir}/benchmark.rb
-%{gem_instdir}/test
+%{gem_instdir}/haml.gemspec
 %{gem_instdir}/yard
+%exclude %{gem_instdir}/yard/default/.gitignore
 
 %changelog
+* Wed May 23 2018 Vít Ondruch <vondruch@redhat.com> - 5.0.4-1
+- Update to Haml 5.0.4.
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index 2420af2..4b81a03 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (haml-5.0.1-tests.tgz) = 81782831437545c0f1023bd285a768ef3344c408eb6d492cb4ef9e7a34fa9cffbccf1d9ddacd2502113884e6e43903b4fb22a184f2d69ab458a5661301dbdd79
-SHA512 (haml-5.0.1.gem) = 9300a810ae7dc30556c177b2eb75f67f0304cbe521ddfa212c6b0f90a193e49c3b78aaefef998fd2a8f9092c945fa54d2613910bc77f4c893febf5e874c81103
+SHA512 (haml-5.0.4-tests.tgz) = e5137b41406881d0507393555e6603035a94a4bbf31d32dd7fad3513050648754ef5f481c1dd414530ad2a8c243c0f16edbff8d95de8a978683e380df18a4c2c
+SHA512 (haml-5.0.4.gem) = 3a3f34c3f74184b4807bb3a03c465aae040392e47eccde82535640faaa246278d35e417072a62c82e340d006203701854b342d938142f582a5de44deac2121a6