diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 00a1e7d8b..e14b2718a 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -183,6 +183,7 @@ Martijn Kruithof
 Martin Landers
 Martin Poeschl
 Martin van den Bemt
+Martin von Gagern
 Mathieu Champlon
 Mathieu Peltier
 Matt Albrecht
diff --git a/build.xml b/build.xml
index 40424f17d..f1f1070a0 100644
--- a/build.xml
+++ b/build.xml
@@ -1386,6 +1386,7 @@
       locale="en"
       windowtitle="${Name} API"
       doctitle="${Name}"
+      failonerror="true"
       verbose="${javadoc.verbose}">
 
       <packageset dir="${java.dir}"/>
@@ -1413,6 +1414,7 @@
     <mkdir dir="${build.tests.javadocs}"/>
     <javadoc useexternalfile="yes"
       destdir="${build.tests.javadocs}"
+      failonerror="true"
       author="true"
       version="true"
       locale="en"
diff --git a/contributors.xml b/contributors.xml
index 4304d8b8d..4f1893107 100644
--- a/contributors.xml
+++ b/contributors.xml
@@ -759,6 +759,10 @@
     <first>Martin</first>
     <last>van den Bemt</last>
   </name>
+  <name>
+    <first>Martin</first>
+    <last>von Gagern</last>
+  </name>
   <name>
     <first>Mathieu</first>
     <last>Champlon</last>
diff --git a/src/main/org/apache/tools/ant/MagicNames.java b/src/main/org/apache/tools/ant/MagicNames.java
index 46e2a59aa..de6746861 100644
--- a/src/main/org/apache/tools/ant/MagicNames.java
+++ b/src/main/org/apache/tools/ant/MagicNames.java
@@ -143,22 +143,22 @@ public final class MagicNames {
     /**
      * property that provides the default value for javac's and
      * javadoc's source attribute.
-     * @since Ant 1.7
      * Value: {@value}
+     * @since Ant 1.7
      */
     public static final String BUILD_JAVAC_SOURCE = "ant.build.javac.source";
 
     /**
      * property that provides the default value for javac's target attribute.
-     * @since Ant 1.7
      * Value: {@value}
+     * @since Ant 1.7
      */
     public static final String BUILD_JAVAC_TARGET = "ant.build.javac.target";
 
     /**
      * Name of the magic property that controls classloader reuse.
-     * @since Ant 1.4.
      * Value: {@value}
+     * @since Ant 1.4.
      */
     public static final String REFID_CLASSPATH_REUSE_LOADER = "ant.reuse.loader";