diff --git a/relax-builder-dep-in-gemspec.patch b/relax-builder-dep-in-gemspec.patch
deleted file mode 100644
index 0b016a4..0000000
--- a/relax-builder-dep-in-gemspec.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- scruffy-0.3.0.beta1.gemspec.orig	2012-07-17 15:16:59.496905405 -0400
-+++ scruffy-0.3.0.beta1.gemspec	2012-07-17 15:17:14.872961826 -0400
-@@ -19,14 +19,14 @@ Gem::Specification.new do |s|
-     s.specification_version = 3
- 
-     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
--      s.add_runtime_dependency(%q<builder>, ["~> 2.0"])
-+      s.add_runtime_dependency(%q<builder>, [">= 2.0"])
-       s.add_development_dependency(%q<rspec>, ["~> 2.3"])
-     else
--      s.add_dependency(%q<builder>, ["~> 2.0"])
-+      s.add_dependency(%q<builder>, [">= 2.0"])
-       s.add_dependency(%q<rspec>, ["~> 2.3"])
-     end
-   else
--    s.add_dependency(%q<builder>, ["~> 2.0"])
-+    s.add_dependency(%q<builder>, [">= 2.0"])
-     s.add_dependency(%q<rspec>, ["~> 2.3"])
-   end
- end
diff --git a/rubygem-scruffy.spec b/rubygem-scruffy.spec
index 274340f..4125668 100644
--- a/rubygem-scruffy.spec
+++ b/rubygem-scruffy.spec
@@ -1,16 +1,25 @@
 # Generated from scruffy-0.2.6.gem by gem2rpm -*- rpm-spec -*-
 %global gem_name scruffy
 
+%global prerelease .beta1
+
+# Ruby 2.4 should ship this macros.
+%if %defined(prerelease)
+%global gem_instdir %{gem_dir}/gems/%{gem_name}-%{version}%{?prerelease}
+%global gem_cache %{gem_dir}/cache/%{gem_name}-%{version}%{?prerelease}.gem
+%global gem_spec %{gem_dir}/specifications/%{gem_name}-%{version}%{?prerelease}.gemspec
+%global gem_docdir %{gem_dir}/doc/%{gem_name}-%{version}%{?prerelease}
+%endif
+
+
 Summary: A powerful, clean graphing library for Ruby
 Name: rubygem-%{gem_name}
 Version: 0.3.0
-Release: 10.beta1%{?dist}
+Release: 11%{?prerelease}%{?dist}
 Group: Development/Languages
 License: MIT
 URL: https://github.com/brasten/scruffy
-Source0: http://rubygems.org/gems/%{gem_name}-%{version}.beta1.gem
-Patch0: relax-builder-dep-in-gemspec.patch
-Requires: rubygem(builder) >= 2.0
+Source0: http://rubygems.org/gems/%{gem_name}-%{version}%{?prerelease}.gem
 BuildRequires: ruby(rubygems)
 BuildRequires: rubygems-devel
 BuildRequires: rubygem(builder)
@@ -18,7 +27,6 @@ BuildRequires: rubygem(minitest)
 BuildRequires: rubygem(rspec)
 BuildRequires: ruby-RMagick
 BuildArch: noarch
-Provides: rubygem(%{gem_name}) = %{version}
 
 %description
 Scruffy is a Ruby library for generating high quality, good looking graphs. It
@@ -35,9 +43,8 @@ Documentation for rubygem-scruffy
 %setup -q -c -T
 %gem_install -n %{SOURCE0}
 
-pushd .%{gem_dir}/specifications
-%patch0 -p0
-popd
+%gemspec_remove_dep -s .%{gem_spec} -g builder '~> 2.0'
+%gemspec_add_dep -s .%{gem_spec} -g builder '>= 2.0'
 
 %build
 
@@ -47,23 +54,26 @@ mkdir -p %{buildroot}%{gem_dir}
 cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}
 
 %check
-pushd .%{gem_instdir}.beta1
+pushd .%{gem_instdir}
 rspec spec
 popd
 
 %files
-%dir %{gem_instdir}.beta1
-%{gem_instdir}.beta1/lib
-%doc %{gem_instdir}.beta1/CHANGES.txt
-%doc %{gem_instdir}.beta1/README.txt
-%{gem_dir}/cache/%{gem_name}-%{version}.beta1.gem
-%{gem_dir}/specifications/%{gem_name}-%{version}.beta1.gemspec
+%dir %{gem_instdir}
+%{gem_instdir}/lib
+%doc %{gem_instdir}/CHANGES.txt
+%doc %{gem_instdir}/README.txt
+%exclude %{gem_cache}
+%{gem_spec}
 
 %files doc
-%doc %{gem_instdir}.beta1/spec
-%doc %{gem_dir}/doc/%{gem_name}-%{version}.beta1
+%doc %{gem_docdir}
+%doc %{gem_instdir}/spec
 
 %changelog
+* Mon Jan 09 2017 Vít Ondruch <vondruch@redhat.com> - 0.3.0-11.beta1
+- Fix FTBFS due to updated RubyGems.
+
 * Mon Apr 18 2016 Vít Ondruch <vondruch@redhat.com> - 0.3.0-10.beta1
 - RPM doesn't produce .orig files anymore.
 
diff --git a/sources b/sources
index 37c7269..2a4a630 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-cb900caa37fe01404e8a648e65fd3a14  scruffy-0.2.6.gem
-a00f45ae6c83a37b6dd1ffa5b26a710d  scruffy-0.3.0.beta1.gem
+SHA512 (scruffy-0.3.0.beta1.gem) = f5847612eca40020ecaf78c994d6177f637bcabdd88abd4a5147221f75347ab0bf77c589def583c3d11b6efe0119be8410dfb794791b74d5514ba157a64f51d6