diff --git a/rubygem-erubis-2.7.0-Add-support-for-Ruby-2.6.patch b/rubygem-erubis-2.7.0-Add-support-for-Ruby-2.6.patch
new file mode 100644
index 0000000..763785a
--- /dev/null
+++ b/rubygem-erubis-2.7.0-Add-support-for-Ruby-2.6.patch
@@ -0,0 +1,66 @@
+From c5d8ee53483761855ce20b9f1a974294bd49c384 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
+Date: Mon, 29 Apr 2019 14:28:57 +0200
+Subject: [PATCH] Add support for Ruby 2.6.
+
+---
+ test/test-main.rb        | 13 +++++++++++++
+ test/test-users-guide.rb |  2 +-
+ test/testutil.rb         |  4 ++++
+ 3 files changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/test/test-main.rb b/test/test-main.rb
+index 212882d..b1e3c52 100644
+--- a/test/test-main.rb
++++ b/test/test-main.rb
+@@ -315,6 +315,19 @@ END
+ 7: syntax error, unexpected end-of-input, expecting keyword_end
+ _buf.to_s
+          ^
++END
++    elsif ruby26?
++      errmsgs << <<'END'
++3: syntax error, unexpected ']', expecting ')'
++...  <li>'; _buf << ( item[:name]] ).to_s; _buf << '</li>
++...                              ^
++-:4: syntax error, unexpected end, expecting ')'
++'; end 
++   ^~~
++-:7: syntax error, unexpected end-of-input, expecting ')'
++END
++      errmsgs << <<'END'
++7: syntax error, unexpected end-of-input, expecting end
+ END
+     elsif rubinius?
+       errmsgs << <<'END'
+diff --git a/test/test-users-guide.rb b/test/test-users-guide.rb
+index c1c52af..5a43382 100644
+--- a/test/test-users-guide.rb
++++ b/test/test-users-guide.rb
+@@ -28,7 +28,7 @@ class KwarkUsersGuideTest < Test::Unit::TestCase
+     s =~ /\A\$ (.*?)\n/
+     command = $1
+     expected = $'
+-    if ruby19? || ruby20? || ruby21? || ruby22? || ruby23? || ruby24? || ruby25?
++    if ruby19? || ruby20? || ruby21? || ruby22? || ruby23? || ruby24? || ruby25? || ruby26?
+       case @name
+       when 'test_main_program1_result'
+         expected.sub!('["eruby", "items", "x", "_buf"]', '[:_buf, :eruby, :items, :x]')
+diff --git a/test/testutil.rb b/test/testutil.rb
+index 1005d31..bead044 100644
+--- a/test/testutil.rb
++++ b/test/testutil.rb
+@@ -41,6 +41,10 @@ def ruby25?  # :nodoc:
+   RUBY_VERSION =~ /\A2.5/
+ end
+ 
++def ruby26?  # :nodoc:
++  RUBY_VERSION =~ /\A2.6/
++end
++
+ def rubinius?  # :nodoc:
+   defined?(RUBY_ENGINE) && RUBY_ENGINE == "rbx"
+ end
+-- 
+2.21.0
+
diff --git a/rubygem-erubis.spec b/rubygem-erubis.spec
index 02dec92..b424fdd 100644
--- a/rubygem-erubis.spec
+++ b/rubygem-erubis.spec
@@ -25,6 +25,8 @@ Patch3: rubygem-erubis-2.7.0-Add-support-for-Ruby-2.3.patch
 Patch4: rubygem-erubis-2.7.0-Add-support-for-Ruby-2.4.patch
 # https://github.com/kwatch/erubis/pull/14
 Patch5: rubygem-erubis-2.7.0-Add-support-for-Ruby-2.5.patch
+# https://github.com/kwatch/erubis/pull/16
+Patch6: rubygem-erubis-2.7.0-Add-support-for-Ruby-2.6.patch
 
 BuildRequires: rubygems-devel
 BuildRequires: ruby(release)
@@ -54,6 +56,7 @@ pushd .%{gem_instdir}
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 popd
 
 %build
@@ -123,6 +126,9 @@ popd
 %{gem_docdir}
 
 %changelog
+* Mon Apr 29 2019 Vít Ondruch <vondruch@redhat.com> - 2.7.0-18
+- Fix test suite for Ruby 2.6 compatibility.
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.0-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 59f3da7..f3dc817 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-4b284994777d2a9cee2081cb4f52fcbf  erubis-2.7.0-public_html.tgz
-cca3cf13ef951d1fc8c124d2fde52565  erubis-2.7.0.gem
+SHA512 (erubis-2.7.0-public_html.tgz) = 3dfbe5c73b7eeacc6856d29559891128cf27eacbada441db193a949d383e2af0ced8a0eff4f753c8f46e361bcb1f024760ac15fddd4b91c776bb8d70103d93aa
+SHA512 (erubis-2.7.0.gem) = 49b08b28656acaf3b0c88fe064bb0d5f79fd08b834d7eba9294217b0893c5a0244ac5dd54de0e52dd17e828a0110e54b29e8c2d75171d527da957917344a0f27