diff --git a/docs/index.html b/docs/index.html
index 2fbd41437..7c7e696de 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -382,7 +382,7 @@ name of the operating system.</p>
 <p>In addition Ant knows some built in properties:</p>
 <ul>
   <li>basedir - the absolute path of the project's basedir (as set
-    with the basedir attribute of &lt;project&gt;.</li>
+    with the basedir attribute of &lt;project&gt;).</li>
   <li>ant.file - the absolute path of the build file.</li>
   <li>ant.java.version - the JVM version Ant detected. Currently it
     can hold the values &quot;1.1&quot;, &quot;1.2&quot; and
@@ -3094,6 +3094,13 @@ instead.</p>
     <td align="center" valign="top">1.2</td>
     <td align="center" valign="top">No</td>
   </tr>
+  <tr>
+    <td valign="top">failonerror</td>
+    <td valign="top">Stop the buildprocess if the command exits with a
+      returncode other than 0.</td>
+    <td align="center" valign="top">all</td>
+    <td align="center" valign="top">No</td>
+  </tr>
 </table>
 
 <h3>Parameters specified as nested elements</h3>
diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
index a15e0ae72..f91582da3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java
@@ -65,7 +65,7 @@ import java.io.*;
  * @author duncan@x180.com
  * @author rubys@us.ibm.com
  * @author thomas.haas@softwired-inc.com
- * @author <a href="mailto:stefan.bodewig@megabit.net">Stefan Bodewig</a>
+ * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  * @author <a href="mailto:mariusz@rakiura.org">Mariusz Nowostawski</a> 
  */
 public class ExecTask extends Task {
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
index d3ce89099..ace5e9a70 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -90,6 +90,7 @@ import java.util.*;
  * @author Stefano Mazzocchi <a href="mailto:stefano@apache.org">stefano@apache.org</a>
  * @author Patrick Chanezon <a href="mailto:chanezon@netscape.com">chanezon@netscape.com</a>
  * @author Ernst de Haan <a href="mailto:ernst@jollem.com">ernst@jollem.com</a>
+ * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  */
 
 public class Javadoc extends Task {
@@ -191,6 +192,7 @@ public class Javadoc extends Task {
     }
 
     private boolean foundJavaFile = false;
+    private boolean failOnError = false;
     private Path sourcePath = null;
     private File destDir = null;
     private String sourceFiles = null;
@@ -543,6 +545,16 @@ public class Javadoc extends Task {
         }
     }
 
+    /**
+     * Should the build process fail if javadoc fails (as indicated by
+     * a non zero return code)?
+     *
+     * <p>Default is false.</p>
+     */
+    public void setFailonerror(boolean b) {
+        failOnError = b;
+    }
+
     public void execute() throws BuildException {
         if ("javadoc2".equals(taskType)) {
             log("!! javadoc2 is deprecated. Use javadoc instead. !!");
@@ -726,7 +738,10 @@ public class Javadoc extends Task {
         exe.setWorkingDirectory(project.getBaseDir());
         try {
             exe.setCommandline(toExecute.getCommandline());
-            exe.execute();
+            int ret = exe.execute();
+            if (ret != 0 && failOnError) {
+                throw new BuildException("Javadoc returned "+ret, location);
+            }
         } catch (IOException e) {
             throw new BuildException("Javadoc failed: " + e, e, location);
         } finally {