diff --git a/.gitignore b/.gitignore
index dc4038d..fc28a67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /XS-Parse-Keyword-0.15.tar.gz
 /XS-Parse-Keyword-0.16.tar.gz
 /XS-Parse-Keyword-0.17.tar.gz
+/XS-Parse-Keyword-0.18.tar.gz
diff --git a/XS-Parse-Keyword-0.17-Fix-t-infix.xs-failure-on-non-x86-platforms.patch b/XS-Parse-Keyword-0.17-Fix-t-infix.xs-failure-on-non-x86-platforms.patch
deleted file mode 100644
index ca0543a..0000000
--- a/XS-Parse-Keyword-0.17-Fix-t-infix.xs-failure-on-non-x86-platforms.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 2dfc35ab974d068d1e27e1ad146c114562a54a3c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Fri, 24 Sep 2021 13:53:26 +0200
-Subject: [PATCH] Fix t/infix.xs failure on non-x86 platforms
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Previously, an invocation of t::infix::addpairsfunc() warned and returned bad data:
-
-    $ perl -Iblib/{lib,arch} t/71infix-wrapper.t
-    ok 1 - add wrapper func
-    ok 2 - intersperse wrapper func
-    Use of uninitialized value in custom infix operator at t/71infix-wrapper.t line 15.
-    Use of uninitialized value in custom infix operator at t/71infix-wrapper.t line 15.
-    not ok 3 - addpairs wrapper func
-    #   Failed test 'addpairs wrapper func'
-    #   at t/71infix-wrapper.t line 26.
-    #     Structures begin differing at:
-    #          $got->[0] = '3'
-    #     $expected->[0] = '4'
-    ok 4 - callchecker generated an OP_CUSTOM call
-
-This error exhibited e.g. on aarch64 platform. This patch fixes it without
-understanding what's going on.
-
-CPAN RT#139445
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- t/infix.xs | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/t/infix.xs b/t/infix.xs
-index 5f1472e..c848470 100644
---- a/t/infix.xs
-+++ b/t/infix.xs
-@@ -108,7 +108,10 @@ OP *pp_addpairs(pTHX)
-   PUSHMARK(SP);
- 
-   while(lhs_count || rhs_count) {
--    mPUSHi(SvIV(*lhs) + SvIV(*rhs));
-+    /* Without an intermediate storage, mPUSHi() reports an undefined value.
-+     * CPAN RT#139445 */
-+    IV o = SvIV(*lhs) + SvIV(*rhs);
-+    mPUSHi(o);
- 
-     lhs++; lhs_count--;
-     rhs++; rhs_count--;
--- 
-2.31.1
-
diff --git a/perl-XS-Parse-Keyword.spec b/perl-XS-Parse-Keyword.spec
index c8126c2..e00d40d 100644
--- a/perl-XS-Parse-Keyword.spec
+++ b/perl-XS-Parse-Keyword.spec
@@ -2,16 +2,13 @@
 %bcond_without perl_XS_Parse_Keyword_enables_optional_test
 
 Name:           perl-XS-Parse-Keyword
-Version:        0.17
+Version:        0.18
 Release:        1%{?dist}
 Summary:        XS functions to assist in parsing keyword syntax
 License:        GPL+ or Artistic
 URL:            https://metacpan.org/release/XS-Parse-Keyword
 Source0:        https://cpan.metacpan.org/authors/id/P/PE/PEVANS/XS-Parse-Keyword-%{version}.tar.gz
 Source1:        macros.perl-XS-Parse-Keyword
-# Fix a test failure on non-x86 platforms, bug #2007391, CPAN RT#139445,
-# proposed to the upstream.
-Patch0:         XS-Parse-Keyword-0.17-Fix-t-infix.xs-failure-on-non-x86-platforms.patch
 BuildRequires:  coreutils
 BuildRequires:  perl-devel
 BuildRequires:  perl-generators
@@ -30,6 +27,7 @@ BuildRequires:  perl(constant)
 BuildRequires:  perl(XSLoader)
 # Tests:
 BuildRequires:  perl(B::Deparse)
+BuildRequires:  perl(overload)
 BuildRequires:  perl(Test::More) >= 0.88
 BuildRequires:  perl(utf8)
 %if %{with perl_XS_Parse_Keyword_enables_optional_test}
@@ -144,6 +142,9 @@ export HARNESS_OPTIONS=j$(perl -e 'if ($ARGV[0] =~ /.*-j([0-9][0-9]*).*/) {print
 %{_libexecdir}/%{name}
 
 %changelog
+* Wed Sep 29 2021 Petr Pisar <ppisar@redhat.com> - 0.18-1
+- 0.18 bump
+
 * Fri Sep 24 2021 Petr Pisar <ppisar@redhat.com> - 0.17-1
 - 0.17 bump
 - Fix a test failure on non-x86 platforms (bug #2007391)
diff --git a/sources b/sources
index 08a3479..c389fb7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (XS-Parse-Keyword-0.17.tar.gz) = f8cd4f0f2975e5547a4fc1dbe62e5beefaee63f076f7c201b1d5fc32b48223b1d1377ca570947d5c37d6e4d3730ed4f87d8ae060af767d9ba71c03a21bcb1b61
+SHA512 (XS-Parse-Keyword-0.18.tar.gz) = ad5d3bba200faf63ba2fc81b38c4e3f54fdb602615c2f7e89d3a3693ac30faf17576d0e38981459d02f310fdfc82bfc049cbc7d4fbdf851f44dd1629ee0870b6