diff --git a/changelog/plugin.jelly b/changelog/plugin.jelly
index 78a445ca..8eba8182 100644
--- a/changelog/plugin.jelly
+++ b/changelog/plugin.jelly
@@ -9,9 +9,14 @@
   <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."/>
   </goal>
+  
+  <goal name="maven-changelog-plugin:deregister">
+    <doc:deregisterReport name="Change Log"/>
+  </goal>
 
   <define:taglib uri="changelog">
     <define:jellybean
diff --git a/checkstyle/plugin.jelly b/checkstyle/plugin.jelly
index 39fd1aee..095b0a1d 100644
--- a/checkstyle/plugin.jelly
+++ b/checkstyle/plugin.jelly
@@ -8,9 +8,14 @@
   <goal name="maven-checkstyle-plugin:register">
     <doc:registerReport 
       name="Checkstyle" 
+      pluginName="maven-checkstyle-plugin"
       link="checkstyle-report"
       description="Report on coding style conventions."/>
   </goal>
+  
+  <goal name="maven-checkstyle-plugin:deregister">
+    <doc:deregisterReport name="Checkstyle"/>
+  </goal>
 
   <!-- ================================================================== -->
   <!-- C H E C K S T Y L E                                                -->
diff --git a/clover/plugin.jelly b/clover/plugin.jelly
index 66aee890..186a5972 100644
--- a/clover/plugin.jelly
+++ b/clover/plugin.jelly
@@ -37,10 +37,15 @@
   <goal name="maven-clover-plugin:register">
     <doc:registerReport 
       name="Clover" 
+      pluginName="maven-clover-plugin" 
       link="clover/index"
       description="Clover test coverage report."/>
   </goal>
   
+  <goal name="maven-clover-plugin:deregister">
+    <doc:deregisterReport name="Clover"/>
+  </goal>
+  
   <goal name="maven-clover-plugin:report">
     <attainGoal name="clover:html-report"/>
   </goal>
@@ -81,7 +86,7 @@
 
     ${pom.getPluginContext('maven-java-plugin').setVariable('maven.build.dest',tmp)}
     ${pom.getPluginContext('maven-test-plugin').setVariable('maven.build.dest',tmp)}
-       
+    
   </goal>
 
   <!-- =================================================================== -->
@@ -96,15 +101,15 @@
     name="clover:html-report"
     prereqs="clover:on,test:test"
     description="Generate HTML test coverage reports with Clover">
-    
+  
     <!--
      |
      | Grab the value maven.docs.dest from the xdoc plugin.
      |
      -->
     <mkdir dir="${cloverReportDirectory}"/>
-
-    <java classname="com.cortexeb.tools.clover.reporters.html.HtmlReporter"
+	
+	<java classname="com.cortexeb.tools.clover.reporters.html.HtmlReporter"
       fork="true">
       <arg line="-o ${cloverReportDirectory}"/>
       <arg line="-i ${clover.initstring}"/>
diff --git a/developer-activity/plugin.jelly b/developer-activity/plugin.jelly
index 158fea77..e9b490da 100644
--- a/developer-activity/plugin.jelly
+++ b/developer-activity/plugin.jelly
@@ -9,9 +9,14 @@
   <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."/>
   </goal>
+  
+  <goal name="maven-developer-activity-plugin:deregister">
+    <doc:deregisterReport name="Developer Activity"/>
+  </goal>
 
   <!-- ================================================================== -->
   <!-- D E V E L O P E R  A C T I V I T Y  R E P O R T                    -->
diff --git a/file-activity/plugin.jelly b/file-activity/plugin.jelly
index 6a89f8ac..992b6fc7 100644
--- a/file-activity/plugin.jelly
+++ b/file-activity/plugin.jelly
@@ -9,9 +9,14 @@
   <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."/>
   </goal>
+  
+  <goal name="maven-file-activity-plugin:deregister">
+    <doc:deregisterReport name="File Activity"/>
+  </goal>
 
   <!-- ================================================================== -->
   <!-- F I L E  A C T I V I T Y  R E P O R T                              -->
diff --git a/javadoc/plugin.jelly b/javadoc/plugin.jelly
index 7cc3d4e4..db48f391 100644
--- a/javadoc/plugin.jelly
+++ b/javadoc/plugin.jelly
@@ -9,14 +9,21 @@
     <j:if test="${sourcesPresent}">
       <doc:registerReport 
         name="JavaDocs" 
+        pluginName="maven-javadoc-plugin"
         link="apidocs/index"
         description="JavaDoc API documentation."/>
       <doc:registerReport 
         name="JavaDoc Report" 
+        pluginName="maven-javadoc-plugin"
         link="javadoc"
         description="Report on the generation of JavaDoc."/>
     </j:if>
   </goal>
+  
+  <goal name="maven-javadoc-plugin:deregister">
+    <doc:deregisterReport name="JavaDocs"/>
+    <doc:deregisterReport name="JavaDoc Report"/>
+  </goal>
 
   <!-- ================================================================== -->
   <!-- J A V A D O C S                                                    -->
diff --git a/jdepend/plugin.jelly b/jdepend/plugin.jelly
index a903ede3..bc3336d4 100644
--- a/jdepend/plugin.jelly
+++ b/jdepend/plugin.jelly
@@ -5,9 +5,14 @@
   <goal name="maven-jdepend-plugin:register">
     <doc:registerReport 
       name="Metrics" 
+      pluginName="maven-jdepend-plugin"
       link="jdepend-report"
       description="Report on source code metrics."/>
   </goal>
+  
+  <goal name="maven-jdepend-plugin:deregister">
+    <doc:deregisterReport name="Metrics"/>
+  </goal>
 
   <!-- ================================================================== -->
   <!-- J D E P E N D  X M L  T A R G E T                                  -->
diff --git a/jellydoc/plugin.jelly b/jellydoc/plugin.jelly
index 6ab21c18..68353aa3 100644
--- a/jellydoc/plugin.jelly
+++ b/jellydoc/plugin.jelly
@@ -9,9 +9,14 @@
   <goal name="maven-jellydoc-plugin:register">
     <doc:registerReport
       name="Jelly Tag Documentation"
+      pluginName="maven-jellydoc-plugin"
       link="tags"
       description="Jelly Tag Documentation."/>
   </goal>
+  
+  <goal name="maven-jellydoc-plugin:deregister">
+    <doc:deregisterReport name="Jelly Tag Documentation"/>
+  </goal>
 
   <goal name="maven-jellydoc-plugin:report"
     prereqs="jellydoc"
diff --git a/junit-report/plugin.jelly b/junit-report/plugin.jelly
index 51f8b410..bb8fe1e5 100644
--- a/junit-report/plugin.jelly
+++ b/junit-report/plugin.jelly
@@ -6,9 +6,14 @@
   
   <goal name="maven-junit-report-plugin:register">
     <doc:registerReport 
-      name="Unit Tests" 
-      link="junit-report"
-      description="Report on the results of the unit tests."/>
+      name="Unit Tests"
+      pluginName="maven-junit-report-plugin"
+      description="Report on the results of the unit tests."
+      link="junit-report"/>
+  </goal>
+  
+  <goal name="maven-junit-report-plugin:deregister">
+    <doc:deregisterReport name="Unit Tests"/>
   </goal>
 
   <!-- ================================================================== -->
diff --git a/jxr/plugin.jelly b/jxr/plugin.jelly
index 2f0c1b28..dbbbbf5a 100644
--- a/jxr/plugin.jelly
+++ b/jxr/plugin.jelly
@@ -10,16 +10,23 @@
     <j:if test="${sourcesPresent}">
       <doc:registerReport 
         name="Source Xref" 
+        pluginName="maven-jxr-plugin" 
         link="xref/index"
         description="A set of browsable cross-referenced sources."/>
       <j:if test="${unitTestSourcesPresent}">
     	<doc:registerReport 
           name="Test Xref" 
+          pluginName="maven-jxr-plugin" 
           link="xref-test/index"
           description="A set of browsable cross-referenced test sources."/>
       </j:if>
     </j:if>
   </goal>
+  
+  <goal name="maven-jxr-plugin:deregister">
+    <doc:deregisterReport name="Source Xref"/>
+    <doc:deregisterReport name="Test Xref"/>
+  </goal>
 
     <define:taglib uri="jxr">
       <define:jellybean
diff --git a/license/plugin.jelly b/license/plugin.jelly
index 3ef28ffa..b8c7d7c4 100644
--- a/license/plugin.jelly
+++ b/license/plugin.jelly
@@ -48,10 +48,15 @@
   <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."/>
   </goal>
   
+  <goal name="maven-license-plugin:deregister">
+    <doc:deregisterReport name="Project License"/>
+  </goal>
+  
   <goal name="maven-license-plugin:report"
     description="Generate an XML file from the license.txt">
     <attainGoal name="license"/>
diff --git a/linkcheck/plugin.jelly b/linkcheck/plugin.jelly
index 362b4a50..70719317 100644
--- a/linkcheck/plugin.jelly
+++ b/linkcheck/plugin.jelly
@@ -10,12 +10,15 @@
   <property name="maven.gen.docs" value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
   
   <goal name="maven-linkcheck-plugin:register">
-    <j:if test="${context.getVariable('maven.mode.online') == null}">
-      <doc:registerReport 
-        name="Link Check Report" 
-        link="linkcheck"
-        description="Report on the validity of all links in the documentation."/>
-    </j:if>
+    <doc:registerReport 
+      name="Link Check Report" 
+      pluginName="maven-linkcheck-plugin"
+      link="linkcheck"
+      description="Report on the validity of all links in the documentation."/>
+  </goal>
+  
+  <goal name="maven-linkcheck-plugin:deregister">
+    <doc:deregisterReport name="Link Check Report"/>
   </goal>
   
   <define:taglib uri="linkcheck">
@@ -40,7 +43,18 @@
   </goal>
   
   <postGoal name="xdoc:jelly-transform">
-  	<attainGoal name="maven-linkcheck-plugin:report-real"/>
+  	<j:set var="reports" value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
+ 	<j:set var="context" value="${pom.getPluginContext('maven-xdoc-plugin')}"/>
+      
+    <j:set var="online">${maven.mode.online}</j:set>
+    
+    <j:if test="${online.trim().length() > 0}">
+      <j:forEach var="report" items="${reports}">
+       <j:if test="${report.get('pluginName').equals('maven-linkcheck-plugin')}">
+	  	 <attainGoal name="maven-linkcheck-plugin:report-real"/>
+  	   </j:if>
+  	  </j:forEach>
+  	</j:if>
   </postGoal>
   
   <goal
diff --git a/site/plugin.jelly b/site/plugin.jelly
index 1745dc2d..85da3ebf 100644
--- a/site/plugin.jelly
+++ b/site/plugin.jelly
@@ -16,60 +16,25 @@
       value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.dest')}"/>
   </goal>
   
+  
   <goal
     name="site"
     description="Generate the web site">
 
-    <j:choose>
-      <j:when test="${!pom.reports.isEmpty()}">
-        <j:forEach var="report" items="${pom.reports}">
-          <j:set var="reportGoal" value="${report}:report"/>
-          <echo>Generating the ${report} ... </echo>
-          <attainGoal name="${reportGoal}"/>
-        </j:forEach>
-      </j:when>
-      <j:otherwise>
-        <attainGoal name="maven-jdepend-plugin:report"/>
-        <attainGoal name="maven-checkstyle-plugin:report"/>
-        <attainGoal name="maven-changelog-plugin:report"/>
-        <attainGoal name="maven-developer-activity-plugin:report"/>
-        <attainGoal name="maven-file-activity-plugin:report"/>
-<!--        
-        <attainGoal name="maven-license-plugin:report"/>
--->        
-        <attainGoal name="maven-javadoc-plugin:report"/>
-        <attainGoal name="maven-jxr-plugin:report"/>
-        <attainGoal name="maven-junit-report-plugin:report"/>
-        <attainGoal name="maven-linkcheck-plugin:report"/>
-        <attainGoal name="maven-tasklist-plugin:report"/>
-      </j:otherwise>
-    </j:choose>
+    <attainGoal name="site:run-reports"/>
     <attainGoal name="xdoc"/>
 
   </goal>
-
-  <goal name="dyna-site">
-    
-    <!--
-     |
-     | What we have listed are the ids of the plugins that can produce
-     | reports. So say we have:
-     |  
-     |  <reports>
-     |
-     |  <report>maven-file-activity</report>
-     |    <report>maven-developer-activity</report>
-     |  </reports>
-     |
-    -->
-    
-    <j:forEach var="report" items="${pom.reports}">
-      <j:set var="reportGoal" value="${report}:report"/>
-      <echo>Generating the ${report} ... </echo>
-      <attainGoal name="${reportGoal}"/>
+  
+  <goal name="site:run-reports" prereqs="xdoc:register-reports">
+  	<j:set var="reports" 
+  		   value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
+	
+  	<j:forEach var="report" items="${reports}">
+      <echo>Generating the ${report.get('name')}... ${report}</echo>
+      <attainGoal name="${report.get('pluginName')}:report"/>
     </j:forEach>
   </goal>
-  
 
   <!-- ================================================================== -->
   <!-- S I T E  D E P L O Y                                               -->
@@ -97,8 +62,6 @@
     -->
 
     <attainGoal name="site:${maven.site.deploy.method}deploy"/>
-
-
   </goal>
 
   <!-- ================================================================== -->
diff --git a/statcvs/plugin.jelly b/statcvs/plugin.jelly
index 87f94506..31c68aa4 100644
--- a/statcvs/plugin.jelly
+++ b/statcvs/plugin.jelly
@@ -20,10 +20,15 @@
   <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"/>
   </goal>
   
+  <goal name="maven-statcvs-plugin:deregister">
+    <doc:deregisterReport name="StatCVS Report"/>
+  </goal>
+  
   <goal name="maven-statcvs-plugin:report">
   	<attainGoal name="statcvs"/>
   </goal>
diff --git a/tasklist/plugin.jelly b/tasklist/plugin.jelly
index fa5b0a32..1f8f2282 100644
--- a/tasklist/plugin.jelly
+++ b/tasklist/plugin.jelly
@@ -7,10 +7,15 @@
 
   <goal name="maven-tasklist-plugin:register">
     <doc:registerReport 
-      name="Task List" 
+      name="Task List"
+      pluginName="maven-tasklist-plugin" 
       link="task-list"
       description="Report on tasks specified in the source code."/>
   </goal>
+  
+  <goal name="maven-tasklist-plugin:deregister">
+    <doc:deregisterReport name="Task List"/>
+  </goal>
 
   <!-- ================================================================== -->
   <!-- T A S K   C R E A T I O N                                          -->
diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly
index 3dfa3d10..28667dcc 100644
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@@ -10,23 +10,58 @@
   xmlns:velocity="jelly:org.apache.commons.jelly.tags.velocity.VelocityTagLibrary"
   xmlns:doc="doc">
 
+  <j:new var="reports" className="java.util.ArrayList"/>
+
 
   <define:taglib uri="doc">
-    
-    <define:tag name="registerReport">
-
+    <define:tag name="deregisterReport">
+    	<!-- @name : Report to deregister, must be same as name used to register -->
+    	
       <j:set 
         var="reports" 
         value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
-
-      <j:new var="report" className="java.util.HashMap"/>
-      <j:set var="dummy" value="${report.put('name', name)}"/>
-      <j:set var="dummy" value="${report.put('link', link)}"/>
-      <j:set var="dummy" value="${report.put('description', description)}"/>
-      <j:set var="dummy" value="${reports.add(report)}"/>
+      
+      <j:set var="removeRpt" value="null"/>
+      <j:forEach var="rpt" items="${reports}">
+      	<j:if test="${rpt.get('name').equals(name)}">
+      		<j:set var="removeRpt" value="${rpt}"/>	
+      	</j:if>
+      </j:forEach>
+      <j:if test="${removeRpt != null}">
+      	<j:set var="dummy" value="${reports.remove(removeRpt)}"/>
+      </j:if>
+    </define:tag>
+    
+    <define:tag name="registerReport">
+      <!--
+    	@name the name of this report. Used for navigation items
+    	@plugin-name the name of the plugin.  @plugin:report goal must exist
+    	@description text description of report
+    	@link the nav-bar link for this report
+    	-->
+      <j:set 
+        var="reports" 
+        value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
+      
+      <j:set var="add" value="true"/>
+      <j:forEach var="rpt" items="${reports}">
+      	<j:if test="${rpt.get('name').equals(name)}">
+      		<j:set var="add" value="false"/>	
+      	</j:if>
+      </j:forEach>
+      
+      <j:if test="${add.equals('true')}">
+        <j:new var="report" className="java.util.HashMap"/>
+        <j:set var="dummy" value="${report.put('name', name)}"/>
+        <j:set var="dummy" value="${report.put('pluginName', pluginName)}"/>
+        <j:set var="dummy" value="${report.put('description', description)}"/>
+        <j:set var="dummy" value="${report.put('link', link)}"/>
+        <j:set var="dummy" value="${reports.add(report)}"/>    
+        <echo>${report}</echo>  	
+      </j:if>
 
     </define:tag>
-
+    
     <define:tag name="formatAsNumber">
       <!--
        | @string
@@ -316,7 +351,6 @@
     <j:useBean var="files" class="org.apache.velocity.texen.util.FileUtil"/>
     
     <j:forEach var="pomDocument" items="${pomDocuments}">
-    
       <velocity:merge 
         name="${maven.gen.docs}/${pomDocument}"
         basedir="${plugin.resources}/templates"
@@ -504,32 +538,36 @@
         locale="${maven.xdoc.date.locale}"/>
     </tstamp>
   </goal>
+  
+  
 
   <goal name="xdoc:register-reports">
-
-    <!--
-     | This should be a LinkedHashSet to prevent someone from
-     | registering somthing twice.  Unfortunately, 1.3 does not 
-     | have a LinkedHashSet so I'll leave this here as a reminder
-     | for us someday.  In the meantime, each time this goal is called,
-     | we'll just replace the old List with a new one.  Shouldn't cause
-     | any problmes.  When we do actually use the Set, we can put a check
-     | to see if 'reports' already exists, and if so, do nothing.
-     | <j:new var="reports" className="java.util.LinkedHashSet"/>
-     |-->
-    <j:new var="reports" className="java.util.ArrayList"/>
-    <j:set var="dummy" value="${pom.getPluginContext('maven-xdoc-plugin').setVariable('reports', reports)}"/>
-
     <!--
      | We need to have each <report> register itself with us so we can
      | build up our navbar.  To do this, we call the plugin:register
      | goal on each report plugin.
      |-->
-    <j:forEach var="report" items="${pom.reports}">
-      <j:set var="reportGoal" value="${report}:register"/>
-      <echo>${report} is registering with the xdoc plugin ... </echo>
-      <attainGoal name="${reportGoal}"/>
-    </j:forEach>
+     
+    <j:if test="${!pom.reports.isEmpty()}">
+  	  <j:forEach var="report" items="${pom.reports}">
+        <attainGoal name="${report}:register"/>
+      </j:forEach>
+    </j:if>
+    
+    <!-- If the descriptor is empty, use these as defaults -->
+    <j:if test="${pom.reports.isEmpty()}">
+  		<attainGoal name="maven-jdepend-plugin:register"/>
+        <attainGoal name="maven-checkstyle-plugin:register"/>
+        <attainGoal name="maven-changelog-plugin:register"/>
+        <attainGoal name="maven-developer-activity-plugin:register"/>
+        <attainGoal name="maven-file-activity-plugin:register"/>
+        <attainGoal name="maven-license-plugin:register"/>
+        <attainGoal name="maven-javadoc-plugin:register"/>
+        <attainGoal name="maven-jxr-plugin:register"/>
+        <attainGoal name="maven-junit-report-plugin:register"/>
+        <attainGoal name="maven-linkcheck-plugin:register"/>
+        <attainGoal name="maven-tasklist-plugin:register"/>
+  	</j:if>
   </goal>
 
   <goal name="xdoc:jelly-transform" 
@@ -588,5 +626,16 @@
     	srcdir="${maven.xdoc.src}" 
     	destdir="${maven.docs.dest}"/>
   </goal>
+  
+  <goal name="xdoc:dump-report-settings">
+  	<echo>Dumping report settings</echo>
+    <j:set 
+       var="reports" 
+       value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('reports')}"/>
+       
+    <j:forEach var="report" items="${reports}">
+    	<echo>Report: ${report}</echo>	
+    </j:forEach>
+  </goal>
 
 </project>