diff --git a/docs/manual/CoreTasks/javac.html b/docs/manual/CoreTasks/javac.html
index a951f3e31..e3bdcfe59 100644
--- a/docs/manual/CoreTasks/javac.html
+++ b/docs/manual/CoreTasks/javac.html
@@ -369,9 +369,9 @@ used.</p>
     <td valign="top">path</td>
   </tr>
   <tr>
-    <td valign="top">implementation</td>
+    <td valign="top">compiler</td>
     <td>Only pass the specified argument if the chosen
-      implementation matches the value of this attribute.
+      compiler implementation matches the value of this attribute.
       Legal values are the
       same as those in the above <a href="#compilervalues">list</a> of valid
       compilers.)</td>
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java
index e2e265732..3da169458 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javac.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java
@@ -850,7 +850,7 @@ public class Javac extends MatchingTask {
 
         private String impl;
 
-        public void setImplementation(String impl) {
+        public void setCompiler(String impl) {
             this.impl = impl;
         }
 
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/JavacTest.java b/src/testcases/org/apache/tools/ant/taskdefs/JavacTest.java
index 70b63b221..0288f93c6 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/JavacTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/JavacTest.java
@@ -127,7 +127,7 @@ public class JavacTest extends TestCase {
         assertEquals("unconditional single arg", 1, args.length);
         assertEquals(testArg, args[0]);
 
-        arg.setImplementation("jikes");
+        arg.setCompiler("jikes");
         args = javac.getCurrentCompilerArgs();
         assertNotNull(args);
         assertEquals("implementation is jikes but build.compiler is null", 
@@ -161,7 +161,7 @@ public class JavacTest extends TestCase {
         String prefect = "Prefect";
         String testArg = ford + " " + prefect;
         arg.setValue(testArg);
-        arg.setImplementation("extJavac");
+        arg.setCompiler("extJavac");
         javac.setFork(true);
         String[] args = javac.getCurrentCompilerArgs();
         assertEquals("both are forked javac", 1, args.length);