diff --git a/file-activity/src/plugin-resources/maven-file-activity-plugin.jsl b/file-activity/src/plugin-resources/maven-file-activity-plugin.jsl
index 30083c5d..3208cac7 100644
--- a/file-activity/src/plugin-resources/maven-file-activity-plugin.jsl
+++ b/file-activity/src/plugin-resources/maven-file-activity-plugin.jsl
@@ -30,13 +30,32 @@
   <j:useBean var="mavenTool" class="org.apache.maven.util.MavenTool"/>
   <jsl:template match="changelog">
     <document>
-      <jsl:applyTemplates/>
-
       <properties>
         <title>File Activity Analysis</title>
       </properties>
       <body>
         <section name="Activity by File">
+          <jsl:applyTemplates select="changeset" />
+        </section>
+      </body>
+    </document>
+  </jsl:template>
+
+  <jsl:template match="changeset">
+    <j:set var="logstart"><x:expr select="@start"/></j:set>
+    <j:set var="logend"><x:expr select="@end"/></j:set>
+        <j:choose>
+          <j:when test="${empty(logstart) and empty(logend)}">
+        <j:set var="setname">Changes from an unknown range</j:set>
+          </j:when>
+          <j:when test="${empty(logend)}">
+        <j:set var="setname">Changes since ${logstart}</j:set>
+          </j:when>
+          <j:otherwise>
+        <j:set var="setname">Changes between ${logstart} and ${logend}</j:set>
+          </j:otherwise>
+        </j:choose>
+    <subsection name="${setname}">
           <p>
             Timeframe: ${maven.changelog.range} days,
             Total Commits:
@@ -44,6 +63,7 @@
             Total Number of Files Changed:
             <x:expr select="count(./changelog-entry/file)"/>
           </p>
+          <jsl:applyTemplates />
           <table>
             <tr>
               <th>File Name</th>
@@ -88,9 +108,7 @@
               </j:forEach>
             </j:forEach>
           </table>
-        </section>
-      </body>
-    </document>
+    </subsection>
   </jsl:template>
 
   <jsl:template match="file">
diff --git a/file-activity/xdocs/changes.xml b/file-activity/xdocs/changes.xml
index ac6627e9..96a968e2 100644
--- a/file-activity/xdocs/changes.xml
+++ b/file-activity/xdocs/changes.xml
@@ -24,6 +24,9 @@
     <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
   </properties>
   <body>
+    <release version="1.5.2" date="in SVN">
+      <action dev="brett" type="fix" issue="MPDEVACTIVITY-4">Make template compatible with changelog 1.8 plugin</action>
+    </release>
     <release version="1.5.1" date="2004-10-23">
       <action dev="dion" type="fix" issue="MPDEVACTIVITY-1">Use maven.changelog.range instead of maven.activity.range.</action>
     </release>
