diff --git a/docs/manual/CoreTasks/basename.html b/docs/manual/CoreTasks/basename.html
index 036a814a6..641c4b558 100644
--- a/docs/manual/CoreTasks/basename.html
+++ b/docs/manual/CoreTasks/basename.html
@@ -55,7 +55,8 @@ a relative-path filename (eg., <code>lib/myjar.jar</code>),
 or a simple filename (eg., <code>myjar.jar</code>).
 <pre>  &lt;basename property=&quot;cmdname&quot; file=&quot;D:/usr/local/foo.exe&quot; suffix=&quot;.exe&quot;/&gt;</pre>
 will set <code>cmdname</code> to <code>foo</code>.
-<pre>  &lt;basename property=&quot;temp.dirname&quot; file=&quot;${env.TEMP}&quot;/&gt;</pre>
+<pre>  &lt;property environment=&quot;env&quot;/&gt;
+  &lt;basename property=&quot;temp.dirname&quot; file=&quot;${env.TEMP}&quot;/&gt;</pre>
 
 will set <code>temp.dirname</code> to the last directory element of
 the path defined for the <code>TEMP</code> environment variable.</p>
diff --git a/docs/manual/CoreTasks/dirname.html b/docs/manual/CoreTasks/dirname.html
index d7bbe697a..f225a93d8 100644
--- a/docs/manual/CoreTasks/dirname.html
+++ b/docs/manual/CoreTasks/dirname.html
@@ -43,7 +43,7 @@ the directory will be the current directory.
 will set <code>antfile.dir</code> to the directory path for
 <code>${ant.file}</code>.
 <pre>  &lt;dirname property=&quot;foo.dirname&quot; file=&quot;foo.txt&quot;/&gt;</pre>
-will set <code>foo.dirname</code> to the current directory.</p>
+will set <code>foo.dirname</code> to the project's basedir.</p>
 
 <hr>
 <p align="center">Copyright &copy; 2002 Apache Software Foundation.
diff --git a/src/main/org/apache/tools/ant/taskdefs/Basename.java b/src/main/org/apache/tools/ant/taskdefs/Basename.java
index 6655af9d1..50907e7b3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Basename.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Basename.java
@@ -84,6 +84,8 @@ import org.apache.tools.ant.Task;
  *
  * @version $Revision$
  *
+ * @since Ant 1.5
+ *
  * @ant.task category="property"
  */
 
@@ -122,7 +124,7 @@ public class Basename extends Task {
             int pos = value.indexOf('.');
             value = value.substring(0, pos);
         }
-        this.project.setProperty(property, value);
+        getProject().setNewProperty(property, value);
       }
   }
 }
diff --git a/src/main/org/apache/tools/ant/taskdefs/Dirname.java b/src/main/org/apache/tools/ant/taskdefs/Dirname.java
index c6559b7a2..d2690310d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Dirname.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Dirname.java
@@ -77,6 +77,8 @@ import org.apache.tools.ant.Task;
  *
  * @version $Revision$
  *
+ * @since Ant 1.5
+ *
  * @ant.task category="property"
  */
 
@@ -104,7 +106,7 @@ public class Dirname extends Task {
           throw new BuildException("file attribute required", location);
       } else {
         String value = file.getParent();
-        this.project.setProperty(property, value);
+        getProject().setNewProperty(property, value);
       }
   }
 }