diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
index 911f0dec0..e19580343 100644
--- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java
+++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
@@ -62,6 +62,7 @@ import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.DirectoryScanner;
 import org.apache.tools.ant.FileScanner;
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.util.FileUtils;
 import org.apache.tools.ant.types.selectors.AndSelector;
 import org.apache.tools.ant.types.selectors.ContainsSelector;
 import org.apache.tools.ant.types.selectors.DateSelector;
@@ -220,8 +221,11 @@ public abstract class AbstractFileSet extends DataType implements Cloneable,
         if (isReference()) {
             throw tooManyAttributes();
         }
-        setDir(file.getParentFile());
-        setIncludes(file.getName());
+        FileUtils fileUtils = FileUtils.newFileUtils();
+        setDir(fileUtils.getParentFile(file));
+
+        PatternSet.NameEntry include = createInclude();
+        include.setName(file.getName());
     }
 
     /**