diff --git a/javadoc/plugin.jelly b/javadoc/plugin.jelly
index 462393ae..93f2f202 100644
--- a/javadoc/plugin.jelly
+++ b/javadoc/plugin.jelly
@@ -75,6 +75,7 @@ maven.javadoc.private = [${maven.javadoc.private}]
maven.javadoc.public = [${maven.javadoc.public}]
maven.javadoc.source = [${maven.javadoc.source}]
maven.javadoc.useexternalfile = [${maven.javadoc.useexternalfile}]
+maven.javadoc.failonerror = [${maven.javadoc.failonerror}]
----------------------------
Standard doclet properties :
----------------------------
@@ -371,6 +372,10 @@ internal_javadoc_working_dir = [${internal_javadoc_working_dir}]
+
+
+
+
diff --git a/javadoc/plugin.properties b/javadoc/plugin.properties
index 3152746e..fc63cdbe 100644
--- a/javadoc/plugin.properties
+++ b/javadoc/plugin.properties
@@ -54,3 +54,4 @@ maven.javadoc.use = true
maven.javadoc.useexternalfile = yes
maven.javadoc.version = true
maven.javadoc.windowtitle = ${pom.name} ${pom.currentVersion} API
+maven.javadoc.failonerror = false
diff --git a/javadoc/xdocs/changes.xml b/javadoc/xdocs/changes.xml
index 6a001977..62bf6997 100644
--- a/javadoc/xdocs/changes.xml
+++ b/javadoc/xdocs/changes.xml
@@ -27,6 +27,7 @@
+ Added maven.javadoc.failonerror property.
Added maven.javadoc.header and maven.javadoc.footer properties.
diff --git a/javadoc/xdocs/properties.xml b/javadoc/xdocs/properties.xml
index 66667c89..55cf333a 100644
--- a/javadoc/xdocs/properties.xml
+++ b/javadoc/xdocs/properties.xml
@@ -133,6 +133,14 @@
the command line shorter. Default value : no.
+
+ | maven.javadoc.failonerror |
+ Yes |
+
+ Stop the buildprocess if the command exits with a returncode other
+ than 0. Default value : false.
+ |
+