diff --git a/.gitignore b/.gitignore
index 3ac192b..b9359c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ builder-2.1.2.gem
 /builder-3.1.4.gem
 /builder-3.2.2.gem
 /builder-3.2.3.gem
+/builder-3.2.4.gem
diff --git a/rubygem-builder.spec b/rubygem-builder.spec
index 75104de..a129caa 100644
--- a/rubygem-builder.spec
+++ b/rubygem-builder.spec
@@ -1,8 +1,8 @@
 %global gem_name builder
 
 Name: rubygem-%{gem_name}
-Version: 3.2.3
-Release: 8%{?dist}
+Version: 3.2.4
+Release: 1%{?dist}
 Summary: Builders for MarkUp
 License: MIT
 URL: http://onestepback.org
@@ -37,22 +37,28 @@ BuildArch: noarch
 Documentation for %{name}.
 
 %prep
-%setup -q -c -T
-%gem_install -n %{SOURCE0}
+%setup -q -n %{gem_name}-%{version}
 
 %build
+# Create the gem as gem install only works on a gem file
+gem build ../%{gem_name}-%{version}.gemspec
+
+# %%gem_install compiles any C extensions and installs the gem into ./%%gem_dir
+# by default, so that we can move it into the buildroot in %%install
+%gem_install
 
 %install
 mkdir -p %{buildroot}%{gem_dir}
 cp -a .%{gem_dir}/* \
         %{buildroot}%{gem_dir}/
 
-# Fix anything executable that does not have a shebang.
-for file in `find %{buildroot}/%{gem_instdir} -name "*.rb"`; do
-    [ ! -z "`head -n 1 $file | grep \"^#!\"`" ] && chmod +x $file
-done
+# Remove shebangs from test files.
+pushd %{buildroot}%{gem_instdir}
+  find -type f -name '*.rb' -print | xargs sed -i '/#!\/usr\/bin\/env/d'
+popd
 
-chmod -x %{buildroot}%{gem_instdir}/doc/releases/builder-2.1.1.rdoc
+# Remove shebang from rake file.
+sed -i '/#!\/usr\/bin\/env/d' %{buildroot}%{gem_instdir}/rakelib/tags.rake
 
 
 %check
@@ -72,11 +78,18 @@ popd
 %doc %{gem_instdir}/CHANGES
 %doc %{gem_instdir}/README.md
 %{gem_instdir}/Rakefile
+%{gem_instdir}/builder.blurb
+%{gem_instdir}/builder.gemspec
 %doc %{gem_instdir}/doc
 %{gem_instdir}/rakelib
 %{gem_instdir}/test
 
 %changelog
+* Fri Apr 17 2020 Vít Ondruch <vondruch@redhat.com> - 3.2.4-1
+- Update to Builder 3.2.4.
+  Resolves: rhbz#1799993
+  Resolves: rhbz#1782394
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index c3c661d..a937ca1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (builder-3.2.3.gem) = 7869f44bcf40d547846d50ab82234694420b2f38e08037ae671c90a7c3b547f11023f864e70adf82970fdddf7ee811730c17e30ec298bb6d1999f4c0c050fbb8
+SHA512 (builder-3.2.4.gem) = 730317ec0a4af33e183283e309e38d47deb08db0ab6bd6dfebdedcebb7470bd383c6c1d32ad674adc43298e0f86930b97c652fff9827ca8890db2d1d68e792f1