diff --git a/findutils-4.6.0-ignore_readdir_race-symlink_loop.patch b/findutils-4.6.0-ignore_readdir_race-symlink_loop.patch
new file mode 100644
index 0000000..f6ac52d
--- /dev/null
+++ b/findutils-4.6.0-ignore_readdir_race-symlink_loop.patch
@@ -0,0 +1,17 @@
+# cherry picked from https://savannah.gnu.org/bugs/?45930
+diff --git a/find/ftsfind.c b/find/ftsfind.c
+index 0d96c4ca..6aeac28c 100644
+--- a/find/ftsfind.c
++++ b/find/ftsfind.c
+@@ -401,6 +401,10 @@ consider_visiting (FTS *p, FTSENT *ent)
+ 	    }
+ 	  else
+ 	    {
++             /* Ignore unlink() error for vanished files.  */
++             if (ENOENT == ent->fts_errno && options.ignore_readdir_race)
++                 return;
++
+ 	      nonfatal_target_file_error (ent->fts_errno, ent->fts_path);
+ 	      /* Continue despite the error, as file name without stat info
+ 	       * might be better than not even processing the file name. This
+
diff --git a/findutils.spec b/findutils.spec
index dcdb6f7..1c06c4d 100644
--- a/findutils.spec
+++ b/findutils.spec
@@ -1,7 +1,7 @@
 Summary: The GNU versions of find utilities (find and xargs)
 Name: findutils
 Version: 4.8.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Epoch: 1
 License: GPLv3+
 URL: https://www.gnu.org/software/findutils/
@@ -22,6 +22,9 @@ Patch4:  findutils-4.6.0-test-lock.patch
 # implement the -noleaf option of find (#1252549)
 Patch5:  findutils-4.6.0-leaf-opt.patch
 
+# fix find not obeying option -ignore_readdir_race in symlink_loop (#2232519)
+Patch6: findutils-4.6.0-ignore_readdir_race-symlink_loop.patch
+
 Conflicts: filesystem < 3
 Provides: /bin/find
 Provides: bundled(gnulib)
@@ -111,6 +114,9 @@ rm -f %{buildroot}%{_infodir}/dir
 %{_infodir}/find-maint.info.*
 
 %changelog
+* Thu Aug 17 2023 Lukáš Zaoral <lzaoral@redhat.com> - 1:4.8.0-6
+- fix find not obeying option -ignore_readdir_race in symlink_loop (#2232519)
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:4.8.0-5
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688