diff --git a/changelog/plugin.jelly b/changelog/plugin.jelly
index 34ec5171..b4fedc22 100644
--- a/changelog/plugin.jelly
+++ b/changelog/plugin.jelly
@@ -8,11 +8,16 @@
   xmlns:doc="doc">
 
   <goal name="maven-changelog-plugin:register">
-    <doc:registerReport 
-      name="Change Log" 
-      pluginName="maven-changelog-plugin"
-      link="changelog-report"
-      description="Report on the source control changelog."/>
+    <j:if test="${context.getVariable('maven.mode.online') == null}">
+      <j:set var="maven.mode.online" value="true" />
+    </j:if>
+    <j:if test="${maven.mode.online}">
+      <doc:registerReport 
+        name="Change Log" 
+        pluginName="maven-changelog-plugin"
+        link="changelog-report"
+        description="Report on the source control changelog."/>
+    </j:if>
   </goal>
   
   <goal name="maven-changelog-plugin:deregister">
diff --git a/checkstyle/plugin.jelly b/checkstyle/plugin.jelly
index 4591795d..9429a6c8 100644
--- a/checkstyle/plugin.jelly
+++ b/checkstyle/plugin.jelly
@@ -166,11 +166,13 @@
      ========================================================================
   -->
   <goal name="maven-checkstyle-plugin:register">
-    <doc:registerReport 
-      name="Checkstyle" 
-      pluginName="checkstyle"
-      link="checkstyle-report"
-      description="Report on coding style conventions."/>
+    <j:if test="${sourcesPresent == 'true'}">
+      <doc:registerReport 
+        name="Checkstyle" 
+        pluginName="checkstyle"
+        link="checkstyle-report"
+        description="Report on coding style conventions."/>
+    </j:if>
   </goal>
   
   <!--
@@ -179,7 +181,9 @@
      ========================================================================
   -->
   <goal name="maven-checkstyle-plugin:deregister">
-    <doc:deregisterReport name="Checkstyle"/>
+    <j:if test="${sourcesPresent == 'true'}">
+      <doc:deregisterReport name="Checkstyle"/>
+    </j:if>
   </goal>
 
 </project>
diff --git a/clover/plugin.jelly b/clover/plugin.jelly
index c8ba01c3..3a37c08d 100644
--- a/clover/plugin.jelly
+++ b/clover/plugin.jelly
@@ -29,15 +29,19 @@
 
 
   <goal name="maven-clover-plugin:register">
-    <doc:registerReport 
-      name="Clover" 
-      pluginName="maven-clover-plugin" 
-      link="clover/index"
-      description="Clover test coverage report."/>
+    <j:if test="${sourcesPresent == 'true'}">
+      <doc:registerReport 
+        name="Clover" 
+        pluginName="maven-clover-plugin" 
+        link="clover/index"
+        description="Clover test coverage report."/>
+    </j:if>
   </goal>
   
   <goal name="maven-clover-plugin:deregister">
-    <doc:deregisterReport name="Clover"/>
+    <j:if test="${sourcesPresent == 'true'}">
+      <doc:deregisterReport name="Clover"/>
+    </j:if>
   </goal>
   
   <goal name="maven-clover-plugin:report">
diff --git a/clover/project.xml b/clover/project.xml
index d4731621..bfe00498 100644
--- a/clover/project.xml
+++ b/clover/project.xml
@@ -58,6 +58,15 @@
         <role>Java Developer</role>
       </roles>
     </developer>
+    <developer>
+      <name>Emmanuel Venisse</name>
+      <id>evenisse</id>
+      <email>evenisse@ifrance.com</email>
+      <organization>Fi System</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
     <developer>
       <name>Jason van Zyl</name>
       <id>jvanzyl</id>
diff --git a/developer-activity/plugin.jelly b/developer-activity/plugin.jelly
index 0df2335c..fa73083b 100644
--- a/developer-activity/plugin.jelly
+++ b/developer-activity/plugin.jelly
@@ -8,11 +8,16 @@
   xmlns:doc="doc">
 
   <goal name="maven-developer-activity-plugin:register">
-    <doc:registerReport 
-      name="Developer Activity" 
-      pluginName="maven-developer-activity-plugin"
-      link="developer-activity-report"
-      description="Report on the amount of developer activity."/>
+    <j:if test="${context.getVariable('maven.mode.online') == null}">
+      <j:set var="maven.mode.online" value="true" />
+    </j:if>
+    <j:if test="${maven.mode.online}">
+      <doc:registerReport 
+        name="Developer Activity" 
+        pluginName="maven-developer-activity-plugin"
+        link="developer-activity-report"
+        description="Report on the amount of developer activity."/>
+    </j:if>
   </goal>
   
   <goal name="maven-developer-activity-plugin:deregister">
diff --git a/developer-activity/project.xml b/developer-activity/project.xml
index c5c415ef..f434372c 100644
--- a/developer-activity/project.xml
+++ b/developer-activity/project.xml
@@ -14,6 +14,17 @@
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/developer-activity/</connection>
     <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/developer-activity/</url>
   </repository>
+  <developers>
+    <developer>
+      <name>Emmanuel Venisse</name>
+      <id>evenisse</id>
+      <email>evenisse@ifrance.com</email>
+      <organization>Fi System</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+  </developers>
   <dependencies>
     <dependency>
       <groupId>commons-jelly</groupId>
diff --git a/file-activity/plugin.jelly b/file-activity/plugin.jelly
index 26454a9b..5b80f3e2 100644
--- a/file-activity/plugin.jelly
+++ b/file-activity/plugin.jelly
@@ -8,11 +8,16 @@
   xmlns:util="jelly:util">
 
   <goal name="maven-file-activity-plugin:register">
-    <doc:registerReport 
-      name="File Activity" 
-      pluginName="maven-file-activity-plugin" 
-      link="file-activity-report"
-      description="Report on file activity."/>
+    <j:if test="${context.getVariable('maven.mode.online') == null}">
+      <j:set var="maven.mode.online" value="true" />
+    </j:if>
+    <j:if test="${maven.mode.online}">
+      <doc:registerReport 
+        name="File Activity" 
+        pluginName="maven-file-activity-plugin" 
+        link="file-activity-report"
+        description="Report on file activity."/>
+    </j:if>
   </goal>
   
   <goal name="maven-file-activity-plugin:deregister">
diff --git a/jdepend/plugin.jelly b/jdepend/plugin.jelly
index 1982c0c4..7f96f308 100644
--- a/jdepend/plugin.jelly
+++ b/jdepend/plugin.jelly
@@ -6,15 +6,19 @@
   xmlns:doc="doc">
 
   <goal name="maven-jdepend-plugin:register">
-    <doc:registerReport 
-      name="Metrics" 
-      pluginName="maven-jdepend-plugin"
-      link="jdepend-report"
-      description="Report on source code metrics."/>
+    <j:if test="${sourcesPresent == 'true'}">
+      <doc:registerReport 
+        name="Metrics" 
+        pluginName="maven-jdepend-plugin"
+        link="jdepend-report"
+        description="Report on source code metrics."/>
+    </j:if>  
   </goal>
   
   <goal name="maven-jdepend-plugin:deregister">
-    <doc:deregisterReport name="Metrics"/>
+    <j:if test="${sourcesPresent == 'true'}">
+      <doc:deregisterReport name="Metrics"/>
+    </j:if>  
   </goal>
 
   <!-- ================================================================== -->
diff --git a/jdepend/project.xml b/jdepend/project.xml
index 1adcb1b2..6a9bea3f 100644
--- a/jdepend/project.xml
+++ b/jdepend/project.xml
@@ -52,6 +52,15 @@
         <role>Release Manager</role>
       </roles>
     </developer>
+    <developer>
+      <name>Emmanuel Venisse</name>
+      <id>evenisse</id>
+      <email>evenisse@ifrance.com</email>
+      <organization>Fi System</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
   </developers>
   <dependencies>
     <dependency>
diff --git a/junit-report/plugin.jelly b/junit-report/plugin.jelly
index e3a3e2b3..24744d1a 100644
--- a/junit-report/plugin.jelly
+++ b/junit-report/plugin.jelly
@@ -6,15 +6,19 @@
   xmlns:j="jelly:core">
   
   <goal name="maven-junit-report-plugin:register">
-    <doc:registerReport 
-      name="Unit Tests"
-      pluginName="maven-junit-report-plugin"
-      description="Report on the results of the unit tests."
-      link="junit-report"/>
+    <j:if test="${unitTestSourcesPresent == 'true'}">
+      <doc:registerReport 
+        name="Unit Tests"
+        pluginName="maven-junit-report-plugin"
+        description="Report on the results of the unit tests."
+        link="junit-report"/>
+    </j:if>
   </goal>
   
   <goal name="maven-junit-report-plugin:deregister">
-    <doc:deregisterReport name="Unit Tests"/>
+    <j:if test="${unitTestSourcesPresent == 'true'}">
+      <doc:deregisterReport name="Unit Tests"/>
+    </j:if>
   </goal>
 
   <!-- ================================================================== -->
diff --git a/junit-report/project.xml b/junit-report/project.xml
index 785491fd..75260ff0 100644
--- a/junit-report/project.xml
+++ b/junit-report/project.xml
@@ -31,6 +31,15 @@
         <role>Java Developer</role>
       </roles>
     </developer>
+    <developer>
+      <name>Emmanuel Venisse</name>
+      <id>evenisse</id>
+      <email>evenisse@ifrance.com</email>
+      <organization>Fi System</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
   </developers>
   <dependencies>
     <dependency>
diff --git a/license/plugin.jelly b/license/plugin.jelly
index 6f921c70..3c50fdf7 100644
--- a/license/plugin.jelly
+++ b/license/plugin.jelly
@@ -46,11 +46,18 @@
   <!-- L I C E N S E                                                      -->
   <!-- ================================================================== -->
   <goal name="maven-license-plugin:register">
-    <doc:registerReport 
-      name="Project License" 
-      pluginName="maven-license-plugin"
-      link="license"
-      description="Displays the primary license for the project."/>
+      <j:set var="licenseFile"><license:fileName /></j:set>
+    <util:available file="${licenseFile}">
+      <j:set var="licensePresent" value="true"/>
+    </util:available>
+    
+    <j:if test="${licensePresent != 'true'}">
+      <doc:registerReport 
+        name="Project License" 
+        pluginName="maven-license-plugin"
+        link="license"
+        description="Displays the primary license for the project."/>
+    </j:if>
   </goal>
   
   <goal name="maven-license-plugin:deregister">
diff --git a/license/project.xml b/license/project.xml
index a8079f37..7453ca42 100644
--- a/license/project.xml
+++ b/license/project.xml
@@ -24,6 +24,15 @@
         <role>Java Developer</role>
       </roles>
     </developer>
+    <developer>
+      <name>Emmanuel Venisse</name>
+      <id>evenisse</id>
+      <email>evenisse@ifrance.com</email>
+      <organization>Fi System</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
     <developer>
       <name>dIon Gillard</name>
       <id>dion</id>
diff --git a/statcvs/plugin.jelly b/statcvs/plugin.jelly
index 037817d9..821a5ff8 100644
--- a/statcvs/plugin.jelly
+++ b/statcvs/plugin.jelly
@@ -18,15 +18,21 @@
        ================================================================== -->
 
   <goal name="maven-statcvs-plugin:register">
-    <doc:registerReport 
-      name="StatCVS Report" 
-      pluginName="maven-statcvs-plugin"
-      link="statcvs/index"
-      description="Show some statistics about the CVS repository"/>
+    <available property="jdk14" classname="java.lang.CharSequence"/>
+
+    <j:if test="${jdk14 == 'true'}">
+      <doc:registerReport 
+        name="StatCVS Report" 
+        pluginName="maven-statcvs-plugin"
+        link="statcvs/index"
+        description="Show some statistics about the CVS repository"/>
+    </j:if>
   </goal>
   
   <goal name="maven-statcvs-plugin:deregister">
-    <doc:deregisterReport name="StatCVS Report"/>
+    <j:if test="${jdk14 == 'true'}">
+      <doc:deregisterReport name="StatCVS Report"/>
+    </j:if>
   </goal>
   
   <goal name="maven-statcvs-plugin:report">
diff --git a/statcvs/project.xml b/statcvs/project.xml
index 463b85d1..fcf81fc3 100644
--- a/statcvs/project.xml
+++ b/statcvs/project.xml
@@ -24,6 +24,15 @@
         <role>Documentation</role>
       </roles>
     </developer>
+    <developer>
+      <name>Emmanuel Venisse</name>
+      <id>evenisse</id>
+      <email>evenisse@ifrance.com</email>
+      <organization>Fi System</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
     <developer>
       <name>Vincent Massol</name>
       <id>vmassol</id>
diff --git a/tasklist/plugin.jelly b/tasklist/plugin.jelly
index 02b6f61b..7d79fa37 100644
--- a/tasklist/plugin.jelly
+++ b/tasklist/plugin.jelly
@@ -6,15 +6,19 @@
   xmlns:vdoclet="vdoclet">
 
   <goal name="maven-tasklist-plugin:register">
-    <doc:registerReport 
-      name="Task List"
-      pluginName="maven-tasklist-plugin" 
-      link="task-list"
-      description="Report on tasks specified in the source code."/>
+    <j:if test="${sourcesPresent}">
+      <doc:registerReport 
+        name="Task List"
+        pluginName="maven-tasklist-plugin" 
+        link="task-list"
+        description="Report on tasks specified in the source code."/>
+    </j:if>
   </goal>
   
   <goal name="maven-tasklist-plugin:deregister">
-    <doc:deregisterReport name="Task List"/>
+    <j:if test="${sourcesPresent}">
+      <doc:deregisterReport name="Task List"/>
+    </j:if>
   </goal>
 
   <!-- ================================================================== -->
diff --git a/tasklist/project.xml b/tasklist/project.xml
index 15c41a46..85a2c2d9 100644
--- a/tasklist/project.xml
+++ b/tasklist/project.xml
@@ -52,6 +52,15 @@
         <role>Java Developer</role>
       </roles>
     </developer>
+    <developer>
+      <name>Emmanuel Venisse</name>
+      <id>evenisse</id>
+      <email>evenisse@ifrance.com</email>
+      <organization>Fi System</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
     <developer>
       <name>Jason van Zyl</name>
       <id>jvanzyl</id>