diff --git a/WHATSNEW b/WHATSNEW
index 315e6968b..4adbd8f47 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -32,6 +32,8 @@ Fixed bugs:
  * Read on System.in hangs for forked java task.
    Bugzilla Report 50960.
 
+ * FileResource specified using basedir/name attributes was non-functional.
+
 Other changes:
 --------------
 
diff --git a/src/main/org/apache/tools/ant/types/resources/FileResource.java b/src/main/org/apache/tools/ant/types/resources/FileResource.java
index fb475027d..516545fd9 100644
--- a/src/main/org/apache/tools/ant/types/resources/FileResource.java
+++ b/src/main/org/apache/tools/ant/types/resources/FileResource.java
@@ -108,6 +108,16 @@ public class FileResource extends Resource implements Touchable, FileProvider,
             return ((FileResource) getCheckedRef()).getFile();
         }
         dieOnCircularReference();
+        synchronized (this) {
+            if (file == null) {
+                //try to resolve file set via basedir/name property setters:
+                File d = getBaseDir();
+                String n = super.getName();
+                if (n != null) {
+                    setFile(FILE_UTILS.resolveFile(d, n));
+                }
+            }
+        }
         return file;
     }