diff --git a/javadoc/plugin.jelly b/javadoc/plugin.jelly
index d4173b95..e6057e0b 100644
--- a/javadoc/plugin.jelly
+++ b/javadoc/plugin.jelly
@@ -210,18 +210,21 @@ internal_javadoc_working_dir      = [${internal_javadoc_working_dir}]
         target="_blank"
         description="JavaDoc API documentation."
         />
-      <doc:registerReport 
-        name="JavaDoc Report" 
-        pluginName=""
-        link="javadoc"
-        description="Report on the generation of JavaDoc."
-        />
-      <doc:registerReport
-        name="JavaDoc Warnings Report"
-        pluginName=""
-        link="javadoc-warnings-report"
-        description="Formatted report of JavaDoc warnings."
-        />        
+      <j:if test="${maven.javadoc.javadocreport}">
+        <doc:registerReport 
+          name="JavaDoc Report" 
+          pluginName=""
+          link="javadoc"
+          description="Report on the generation of JavaDoc."
+          />
+      </j:if>
+      <j:if test="${maven.javadoc.warningsreport}">
+        <doc:registerReport
+          name="JavaDoc Warnings Report"
+          pluginName=""
+          link="javadoc-warnings-report"
+          description="Formatted report of JavaDoc warnings."/>
+      </j:if>
     </j:if>
   </goal>
   
@@ -544,12 +547,15 @@ internal_javadoc_working_dir      = [${internal_javadoc_working_dir}]
         <j:arg type="java.lang.String" value="" />
       </j:invokeStatic>
 
+      <j:if test="${maven.javadoc.javadocreport}">
       <doc:text-xdoc
         title="Javadoc Report"
         section="Javadoc Report"
         inputText="${inputText}"
         output="${genDocs}/javadoc.xml"/>
+      </j:if>
 
+      <j:if test="${maven.javadoc.warningsreport}">
       <javadoc:javadocwarnings
         verbose="${maven.javadoc.debug}"
         inputFileName="${internal_javadoc_working_dir}/report.txt"
@@ -564,6 +570,7 @@ internal_javadoc_working_dir      = [${internal_javadoc_working_dir}]
         outputMode="xml"
         prettyPrint="true"
       />
+      </j:if>
       
       <ant:delete dir="${internal_javadoc_src_tmp}"/>
       
diff --git a/javadoc/plugin.properties b/javadoc/plugin.properties
index 6b5ba163..c745c736 100644
--- a/javadoc/plugin.properties
+++ b/javadoc/plugin.properties
@@ -55,3 +55,5 @@ maven.javadoc.useexternalfile       = yes
 maven.javadoc.version               = true
 maven.javadoc.windowtitle           = ${pom.name} ${pom.currentVersion} API
 maven.javadoc.failonerror           = false
+maven.javadoc.warningsreport        = true
+maven.javadoc.javadocreport         = true
\ No newline at end of file
diff --git a/javadoc/xdocs/changes.xml b/javadoc/xdocs/changes.xml
index fc13e6ec..15983c8b 100644
--- a/javadoc/xdocs/changes.xml
+++ b/javadoc/xdocs/changes.xml
@@ -27,6 +27,7 @@
   </properties>
   <body>
     <release version="1.8-SNAPSHOT" date="In SVN">
+      <action dev="ltheussl" type="add" issue="MPJAVADOC-65">Added maven.javadoc.warningsreport and maven.javadoc.javadocreport properties.</action>
       <action dev="ltheussl" type="update" issue="MPJAVADOC-66">The maxmemory property is set to 512m by default.</action>
       <action dev="ltheussl" type="fix" issue="MPJAVADOC-61">StringIndexOutOfBoundsException on parsing the files.</action>
       <action dev="aheritier" type="fix" issue="MPJAVADOC-59">Files package.html and overview.html are not copied when source modifications are used.</action>
diff --git a/javadoc/xdocs/properties.xml b/javadoc/xdocs/properties.xml
index 3373b231..2f94b532 100644
--- a/javadoc/xdocs/properties.xml
+++ b/javadoc/xdocs/properties.xml
@@ -141,6 +141,20 @@
             than 0. Default value : false.
           </td>
         </tr>
+        <tr>
+          <td>maven.javadoc.javadocreport</td>
+          <td>Yes</td>
+          <td>
+            Include the javadoc report. Default value: true.
+          </td>
+        </tr>
+        <tr>
+          <td>maven.javadoc.warningsreport</td>
+          <td>Yes</td>
+          <td>
+            Include the javadoc warnings report. Default value: true.
+          </td>
+        </tr>
       </table>
     </section>
     <section name="Standard Doclet Settings">