Index: pom.xml
===================================================================
--- pom.xml	(revision 627170)
+++ pom.xml	(working copy)
@@ -187,9 +187,19 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-module-xdoc</artifactId>
+      <version>${doxiaVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
       <artifactId>doxia-sink-api</artifactId>
       <version>${doxiaVersion}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-logging-api</artifactId>
+      <version>${doxiaVersion}</version>
+    </dependency>
 
     <!-- Doxia-sitetools -->
     <dependency>
@@ -356,8 +366,8 @@
   </profiles>
 
   <properties>
-    <doxiaVersion>1.0-alpha-11-SNAPSHOT</doxiaVersion>
-    <doxiaSitetoolsVersion>1.0-alpha-11-SNAPSHOT</doxiaSitetoolsVersion>
+    <doxiaVersion>1.0-beta-1-SNAPSHOT</doxiaVersion>
+    <doxiaSitetoolsVersion>1.0-beta-1-SNAPSHOT</doxiaSitetoolsVersion>
     <wagonVersion>1.0-beta-2</wagonVersion>
   </properties>
 </project>
Index: src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java
===================================================================
--- src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java	(revision 627170)
+++ src/main/java/org/apache/maven/plugins/site/AbstractSiteRenderingMojo.java	(working copy)
@@ -311,7 +311,7 @@
                 reportsByOutputName.put( report.getOutputName(), report );
 
                 RenderingContext renderingContext = new RenderingContext( siteDirectory, outputName );
-                ReportDocumentRenderer renderer = new ReportDocumentRenderer( report, renderingContext, getLog() );
+                ReportDocumentRenderer renderer = new ReportDocumentRenderer( report, renderingContext, getLog(), siteTool );
                 documents.put( outputName, renderer );
             }
         }
@@ -366,7 +366,7 @@
             String desc1 = i18n.getString( "site-plugin", locale, "report.information.description1" );
             String desc2 = i18n.getString( "site-plugin", locale, "report.information.description2" );
             DocumentRenderer renderer = new CategorySummaryDocumentRenderer( renderingContext, title, desc1, desc2,
-                                                                             i18n, categoryReports );
+                                                                             i18n, categoryReports, getLog(), siteTool );
 
             if ( !documents.containsKey( renderer.getOutputName() ) )
             {
@@ -386,7 +386,7 @@
             String desc1 = i18n.getString( "site-plugin", locale, "report.project.description1" );
             String desc2 = i18n.getString( "site-plugin", locale, "report.project.description2" );
             DocumentRenderer renderer = new CategorySummaryDocumentRenderer( renderingContext, title, desc1, desc2,
-                                                                             i18n, categoryReports );
+                                                                             i18n, categoryReports, getLog(), siteTool );
 
             if ( !documents.containsKey( renderer.getOutputName() ) )
             {
Index: src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java
===================================================================
--- src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java	(revision 627170)
+++ src/main/java/org/apache/maven/plugins/site/CategorySummaryDocumentRenderer.java	(working copy)
@@ -25,6 +25,9 @@
 import org.apache.maven.doxia.siterenderer.RendererException;
 import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
 import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
+import org.apache.maven.doxia.tools.MojoLogWrapper;
+import org.apache.maven.doxia.tools.SiteTool;
+import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.reporting.MavenReport;
 import org.codehaus.plexus.i18n.I18N;
 
@@ -43,20 +46,24 @@
 public class CategorySummaryDocumentRenderer
     implements DocumentRenderer
 {
-    private RenderingContext renderingContext;
+    private final RenderingContext renderingContext;
 
-    private String title;
+    private final String title;
 
-    private String desc1;
+    private final String desc1;
 
-    private String desc2;
+    private final String desc2;
 
-    private I18N i18n;
+    private final I18N i18n;
 
-    private List categoryReports;
+    private final List categoryReports;
 
+    private final Log log;
+
+    private final SiteTool siteTool;
+
     public CategorySummaryDocumentRenderer( RenderingContext renderingContext, String title, String desc1, String desc2,
-                                            I18N i18n, List categoryReports )
+                                            I18N i18n, List categoryReports, Log log, SiteTool siteTool )
     {
         this.renderingContext = renderingContext;
         this.title = title;
@@ -64,12 +71,15 @@
         this.desc2 = desc2;
         this.i18n = i18n;
         this.categoryReports = Collections.unmodifiableList( categoryReports );
+        this.log = log;
+        this.siteTool = siteTool;
     }
 
     public void renderDocument( Writer writer, Renderer renderer, SiteRenderingContext siteRenderingContext )
         throws RendererException, FileNotFoundException
     {
         SiteRendererSink sink = new SiteRendererSink( renderingContext );
+        sink.enableLogging( new MojoLogWrapper( log ) );
 
         sink.head();
 
Index: src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java
===================================================================
--- src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java	(revision 627170)
+++ src/main/java/org/apache/maven/plugins/site/ReportDocumentRenderer.java	(working copy)
@@ -27,6 +27,8 @@
 import org.apache.maven.doxia.siterenderer.RendererException;
 import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
 import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
+import org.apache.maven.doxia.tools.MojoLogWrapper;
+import org.apache.maven.doxia.tools.SiteTool;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.reporting.MavenReport;
 import org.apache.maven.reporting.MavenMultiPageReport;
@@ -50,19 +52,23 @@
 public class ReportDocumentRenderer
     implements DocumentRenderer
 {
-    private MavenReport report;
+    private final MavenReport report;
 
-    private RenderingContext renderingContext;
+    private final RenderingContext renderingContext;
 
-    private Log log;
+    private final Log log;
 
-    public ReportDocumentRenderer( MavenReport report, RenderingContext renderingContext, Log log )
+    private final SiteTool siteTool;
+
+    public ReportDocumentRenderer( MavenReport report, RenderingContext renderingContext, Log log, SiteTool siteTool )
     {
         this.report = report;
 
         this.renderingContext = renderingContext;
 
         this.log = log;
+
+        this.siteTool = siteTool;
     }
 
     private static class MySink extends SiteRendererSink
@@ -125,6 +131,7 @@
         MySinkFactory sf = new MySinkFactory( renderingContext );
 
         SiteRendererSink sink = new SiteRendererSink( renderingContext );
+        sink.enableLogging( new MojoLogWrapper( log ) );
 
         try
         {
@@ -160,6 +167,7 @@
                 for ( Iterator it = sinks.iterator(); it.hasNext(); )
                 {
                     MySink mySink = (MySink) it.next();
+                    mySink.enableLogging( new MojoLogWrapper( log ) );
 
                     log.debug( "  Rendering " +  mySink.getOutputName() );