diff --git a/src/main/org/apache/tools/ant/ComponentHelper.java b/src/main/org/apache/tools/ant/ComponentHelper.java
index 5af83be28..a764f99c9 100644
--- a/src/main/org/apache/tools/ant/ComponentHelper.java
+++ b/src/main/org/apache/tools/ant/ComponentHelper.java
@@ -112,7 +112,7 @@ public class ComponentHelper  {
      */
     private Stack antLibStack = new Stack();
     /** current antlib context */
-    private AntTypeTable antLibTypeTable = null;
+    private AntTypeTable antLibCurrentTypeTable = null;
 
     /**
      * Map from task names to vectors of created tasks
@@ -268,8 +268,10 @@ public class ComponentHelper  {
     public AntTypeDefinition getDefinition(String componentName) {
         checkNamespace(componentName);
         AntTypeDefinition ret = null;
-        if (antLibTypeTable != null && componentName.indexOf(':') == -1) {
-            ret = antLibTypeTable.getDefinition(componentName);
+        if (antLibCurrentTypeTable != null
+            && ProjectHelper.ANT_CURRENT_URI.equals(
+                ProjectHelper.extractUriFromComponentName(componentName))) {
+            ret = antLibCurrentTypeTable.getDefinition(componentName);
         }
         if (ret == null) {
             ret = antTypeTable.getDefinition(componentName);
@@ -689,9 +691,11 @@ public class ComponentHelper  {
                         Project.MSG_DEBUG);
             antTypeTable.put(name, def);
 
-            if (antLibTypeTable != null && name.lastIndexOf(':') != -1) {
+            if (antLibCurrentTypeTable != null && name.lastIndexOf(':') != -1) {
                 String baseName = name.substring(name.lastIndexOf(':') + 1);
-                antLibTypeTable.put(baseName, def);
+                antLibCurrentTypeTable.put(
+                    ProjectHelper.genComponentName(
+                        ProjectHelper.ANT_CURRENT_URI, baseName), def);
             }
         }
     }
@@ -700,8 +704,8 @@ public class ComponentHelper  {
      * Called at the start of processing an antlib
      */
     public void enterAntLib() {
-        antLibTypeTable = new AntTypeTable(project);
-        antLibStack.push(antLibTypeTable);
+        antLibCurrentTypeTable = new AntTypeTable(project);
+        antLibStack.push(antLibCurrentTypeTable);
     }
 
     /**
@@ -710,9 +714,9 @@ public class ComponentHelper  {
     public void exitAntLib() {
         antLibStack.pop();
         if (antLibStack.size() != 0) {
-            antLibTypeTable = (AntTypeTable) antLibStack.peek();
+            antLibCurrentTypeTable = (AntTypeTable) antLibStack.peek();
         } else {
-            antLibTypeTable = null;
+            antLibCurrentTypeTable = null;
         }
     }
 
diff --git a/src/main/org/apache/tools/ant/ProjectHelper.java b/src/main/org/apache/tools/ant/ProjectHelper.java
index 27b193dc2..58d965c4d 100644
--- a/src/main/org/apache/tools/ant/ProjectHelper.java
+++ b/src/main/org/apache/tools/ant/ProjectHelper.java
@@ -88,6 +88,9 @@ public class ProjectHelper {
     /** The URI for ant name space */
     public static final String ANT_CORE_URI       = "ant:core";
 
+    /** The URI for antlib current definitions */
+    public static final String ANT_CURRENT_URI      = "ant:current";
+
     /** The URI for defined types/tasks - the format is antlib:<package> */
     public static final String ANTLIB_URI     = "antlib:";