diff --git a/src/main/org/apache/tools/ant/taskdefs/Available.java b/src/main/org/apache/tools/ant/taskdefs/Available.java
index 3a7c01ace..ec58b4313 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Available.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Available.java
@@ -76,6 +76,13 @@ public class Available extends Task {
     }
 
     public void setClass(String classname) {
+        project.log("The class attribute is deprecated. " +
+                    "Please use the classname attribute.",
+                    Project.MSG_WARN);
+        this.classname = classname;
+    }
+
+    public void setClassname(String classname) {
         this.classname = classname;
     }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Java.java b/src/main/org/apache/tools/ant/taskdefs/Java.java
index 37b18ecfc..feba88e2e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Java.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Java.java
@@ -118,9 +118,19 @@ public class Java extends Exec {
     }
     
     /**
-     * Set the source file.
+     * Set the source file (deprecated).
      */
     public void setClass(String s) {
+        project.log("The class attribute is deprecated. " +
+                    "Please use the classname attribute.",
+                    Project.MSG_WARN);
+        this.classname = s;
+    }
+
+    /**
+     * Set the source file.
+     */
+    public void setClassname(String s) {
         this.classname = s;
     }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Rmic.java b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
index 6215d1956..f4f41c523 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Rmic.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Rmic.java
@@ -89,6 +89,13 @@ public class Rmic extends Task {
     }
 
     public void setClass(String classname) {
+        project.log("The class attribute is deprecated. " +
+                    "Please use the classname attribute.",
+                    Project.MSG_WARN);
+        this.classname = classname;
+    }
+
+    public void setClassname(String classname) {
         this.classname = classname;
     }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Taskdef.java b/src/main/org/apache/tools/ant/taskdefs/Taskdef.java
index d338bfcec..231b2e506 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Taskdef.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Taskdef.java
@@ -90,6 +90,13 @@ public class Taskdef extends Task {
     }
 
     public void setClass(String v) {
+        project.log("The class attribute is deprecated. " +
+                    "Please use the classname attribute.",
+                    Project.MSG_WARN);
+        value = v;
+    }
+
+    public void setClassname(String v) {
 	value = v;
     }
 }