diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java
index 0d35ebe86..1bbb12572 100644
--- a/src/main/org/apache/tools/ant/ProjectHelper.java
+++ b/src/main/org/apache/tools/ant/ProjectHelper.java
@@ -464,6 +464,8 @@ public class ProjectHelper {
             if (task == null) {
                 task = new UnknownElement(tag);
                 task.setProject(project);
+                task.setTaskType(tag);
+                task.setTaskName(tag);
             }
 
             task.setLocation(new Location(buildFile.toString(), locator.getLineNumber(), locator.getColumnNumber()));
diff --git a/src/main/org/apache/tools/ant/UnknownElement.java b/src/main/org/apache/tools/ant/UnknownElement.java
index c4d938610..a96cb7dc8 100644
--- a/src/main/org/apache/tools/ant/UnknownElement.java
+++ b/src/main/org/apache/tools/ant/UnknownElement.java
@@ -169,4 +169,13 @@ public class UnknownElement extends Task {
         return task;
     }
 
+    /**
+     * Get the name to use in logging messages.
+     *
+     * @return the name to use in logging messages.
+     */
+    public String getTaskName() {
+        return realTask == null ? super.getTaskName() : realTask.getTaskName();
+    }
+
 }// UnknownElement