diff --git a/apache-commons-io.spec b/apache-commons-io.spec
index f079b980e3e5bc6a2390b96e4475d6169bc06d7f..396352b78b175ff26d816b6930a14cd99e81bdb2 100644
--- a/apache-commons-io.spec
+++ b/apache-commons-io.spec
@@ -1,7 +1,7 @@
 Name:           apache-commons-io
 Epoch:          1
 Version:        2.6
-Release:        8
+Release:        9
 Summary:        A library of utilities for developing IO functionality.
 License:        ASL 2.0
 URL:            http://commons.apache.org/proper/commons-io
@@ -10,6 +10,7 @@ Patch0000:      CVE-2021-29425-1.patch
 Patch0001:      CVE-2021-29425-2.patch
 Patch0002:      CVE-2021-29425-3.patch
 Patch0003:      CVE-2021-29425-4.patch
+Patch0004:      remove-duplicate-dir-check.patch
 BuildArch:      noarch
 BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin) maven-local
 BuildRequires:  mvn(org.apache.commons:commons-parent:pom:) mvn(junit:junit)
@@ -49,6 +50,9 @@ xmvn test --batch-mode --offline verify
 %doc RELEASE-NOTES.txt
 
 %changelog
+* Thu Nov 07 2024 shaojiansong <shaojiansong@kylinos.cn> - 1:2.6-9
+- Backport the bugfix of duplicate directory check logic.
+
 * Fri Sep 23 2022 yaoxin <yaoxin30@h-partners.com> - 1:2.6-8
 - Remove the empty Ignore-some-test-because-bep.patch file.
 
diff --git a/remove-duplicate-dir-check.patch b/remove-duplicate-dir-check.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7bcb76dc709431e4c56240e1dae9d778134e8fd8
--- /dev/null
+++ b/remove-duplicate-dir-check.patch
@@ -0,0 +1,14 @@
+diff -Naur commons-io-2.6-src/src/main/java/org/apache/commons/io/FileUtils.java commons-io-2.6-src-update/src/main/java/org/apache/commons/io/FileUtils.java
+--- commons-io-2.6-src/src/main/java/org/apache/commons/io/FileUtils.java	2017-10-14 19:57:32.000000000 +0800
++++ commons-io-2.6-src-update/src/main/java/org/apache/commons/io/FileUtils.java	2024-11-07 19:57:00.044155319 +0800
+@@ -594,9 +594,7 @@
+ 
+         //Find files
+         final Collection<File> files = new java.util.LinkedList<>();
+-        if (directory.isDirectory()) {
+-            files.add(directory);
+-        }
++        files.add(directory);
+         innerListFiles(files, directory,
+                 FileFilterUtils.or(effFileFilter, effDirFilter), true);
+         return files;