diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 1e9c53e38..03f8bc688 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -175,6 +175,7 @@ Michael J. Sikorsky
 Michael McCallum
 Michael Montuori
 Michael Newcomb
+Micheal Nygard
 Michael Saunders
 Miha
 Mike Roberts
@@ -252,6 +253,7 @@ Thomas Butz
 Thomas Christen
 Thomas Christensen
 Thomas Haas
+Thomas Quas
 Tim Drury
 Tim Fennell
 Timothy Gerard Endres
diff --git a/WHATSNEW b/WHATSNEW
index 9b14816ec..8a12b32b1 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -25,6 +25,9 @@ Other changes:
 
 * <script> can now work with bsf.jar and js.jar in its <classpath>.
 
+* add errorProperty and updatedProperty to <javac>
+  Bugzilla 35637 and 28941.
+
 Changes from Ant 1.6.5 to Ant 1.7.0
 ===================================
 
diff --git a/contributors.xml b/contributors.xml
index 18b55643d..b2270ef26 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -704,6 +704,10 @@
     <first>Michael</first>
     <last>Newcomb</last>
   </name>
+  <name>
+    <first>Michael</first>
+    <last>Nygard</last>
+  </name>
   <name>
     <first>Michael</first>
     <last>Saunders</last>
@@ -1001,6 +1005,10 @@
     <first>Thomas</first>
     <last>Haas</last>
   </name>
+  <name>
+    <first>Thomas</first>
+    <last>Quas</last>
+  </name>
   <name>
     <first>Tim</first>
     <last>Drury</last>
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java
index 773471768..4840e11d3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javac.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java
@@ -113,6 +113,9 @@ public class Javac extends MatchingTask {
     private String source;
     private String debugLevel;
     private File tmpDir;
+    private String updatedProperty;
+    private String errorProperty;
+    private boolean taskSuccess = true; // assume the best
 
     /**
      * Javac task for compilation of Java files.
@@ -792,6 +795,37 @@ public class Javac extends MatchingTask {
         return tmpDir;
     }
 
+    /**
+     * The property to set on compliation success.
+     * This property will not be set if the compilation
+     * fails, or if there are no files to compile.
+     * @param updatedProperty the property name to use.
+     * @since Ant 1.7.1.
+     */
+    public void setUpdatedProperty(String updatedProperty) {
+        this.updatedProperty = updatedProperty;
+    }
+
+    /**
+     * The property to set on compliation failure.
+     * This property will be set if the compilation
+     * fails.
+     * @param errorProperty the property name to use.
+     * @since Ant 1.7.1.
+     */
+    public void setErrorProperty(String errorProperty) {
+        this.errorProperty = errorProperty;
+    }
+
+    /**
+     * Get the result of the javac task (success or failure).
+     * @return true if compilation succeeded, or
+     *         was not neccessary, false if the compilation failed.
+     */
+    public boolean getTaskSuccess() {
+        return taskSuccess;
+    }
+
     /**
      * Executes the task.
      * @exception BuildException if an error occurs
@@ -818,6 +852,11 @@ public class Javac extends MatchingTask {
         }
 
         compile();
+        if (updatedProperty != null
+            && taskSuccess
+            && compileList.length != 0) {
+            getProject().setNewProperty(updatedProperty, "true");
+        }
     }
 
     /**
@@ -995,6 +1034,11 @@ public class Javac extends MatchingTask {
 
             // finally, lets execute the compiler!!
             if (!adapter.execute()) {
+                this.taskSuccess = false;
+                if (errorProperty != null) {
+                    getProject().setNewProperty(
+                        errorProperty, "true");
+                }
                 if (failOnError) {
                     throw new BuildException(FAIL_MSG, getLocation());
                 } else {