diff --git a/bind-9.18-tests-rbtdb_test-i686.patch b/bind-9.18-tests-rbtdb_test-i686.patch
new file mode 100644
index 0000000..a709217
--- /dev/null
+++ b/bind-9.18-tests-rbtdb_test-i686.patch
@@ -0,0 +1,41 @@
+From 37643c9689c2dee85b453879f7145bb393b99dfa Mon Sep 17 00:00:00 2001
+From: Petr Mensik <pemensik@redhat.com>
+Date: Fri, 22 Sep 2023 19:54:36 +0200
+Subject: [PATCH] Skip failing tests on 32 platform
+
+Reported to fail also on 32 bit arm, but skip it only on current builds.
+---
+ tests/dns/rbtdb_test.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tests/dns/rbtdb_test.c b/tests/dns/rbtdb_test.c
+index 59a5786..384a26a 100644
+--- a/tests/dns/rbtdb_test.c
++++ b/tests/dns/rbtdb_test.c
+@@ -326,6 +326,7 @@ ISC_RUN_TEST_IMPL(overmempurge_bigrdata) {
+ 	isc_mem_destroy(&mctx2);
+ }
+ 
++#ifndef i386
+ ISC_RUN_TEST_IMPL(overmempurge_longname) {
+ 	size_t maxcache = 2097152U; /* 2MB - same as DNS_CACHE_MINSIZE */
+ 	size_t hiwater = maxcache - (maxcache >> 3); /* borrowed from cache.c */
+@@ -370,12 +371,15 @@ ISC_RUN_TEST_IMPL(overmempurge_longname) {
+ 	dns_db_detach(&db);
+ 	isc_mem_destroy(&mctx2);
+ }
++#endif
+ 
+ ISC_TEST_LIST_START
+ ISC_TEST_ENTRY(ownercase)
+ ISC_TEST_ENTRY(setownercase)
+ ISC_TEST_ENTRY(overmempurge_bigrdata)
++#ifndef i386
+ ISC_TEST_ENTRY(overmempurge_longname)
++#endif
+ ISC_TEST_LIST_END
+ 
+ ISC_TEST_MAIN
+-- 
+2.41.0
+
diff --git a/bind.spec b/bind.spec
index 8691bc2..e88b33c 100644
--- a/bind.spec
+++ b/bind.spec
@@ -76,7 +76,7 @@ License:  MPL-2.0 AND ISC AND MIT AND BSD-3-Clause AND BSD-2-Clause
 # ./lib/isc/string.c BSD-3-clause and/or MPL-2.0
 # ./lib/isc/tm.c BSD-2-clause and/or MPL-2.0
 # ./lib/isccfg/parser.c BSD-2-clause and/or MPL-2.0
-Version:  9.18.18
+Version:  9.18.19
 Release:  1%{?dist}
 Epoch:    32
 Url:      https://www.isc.org/downloads/bind/
@@ -114,6 +114,8 @@ Patch10: bind-9.5-PIE.patch
 Patch16: bind-9.16-redhat_doc.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=2122010
 Patch26: bind-9.18-unittest-netmgr-unstable.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=2240253
+Patch27: bind-9.18-tests-rbtdb_test-i686.patch
 
 %{?systemd_ordering}
 Requires:       coreutils
@@ -962,6 +964,12 @@ fi;
 %endif
 
 %changelog
+* Fri Sep 22 2023 Petr Menšík <pemensik@redhat.com> - 32:9.18.19-1
+- Update to 9.18.19 (#2232346)
+
+* Fri Sep 22 2023 Petr Menšík <pemensik@redhat.com> - 32:9.18.18-2
+- Skip failing rbtdb_test unit test on i686 (#2240253)
+
 * Wed Sep 06 2023 Petr Menšík <pemensik@redhat.com> - 32:9.18.18-1
 - Update to 9.18.18 (#2232346)