diff --git a/dashboard/plugin.properties b/dashboard/plugin.properties
index 3cec596a..91af79af 100644
--- a/dashboard/plugin.properties
+++ b/dashboard/plugin.properties
@@ -100,7 +100,7 @@ maven.dashboard.aggregator.csfiles.artifact = ${maven.build.dir}/checkstyle-raw-
 maven.dashboard.aggregator.csfiles.label = CS Files
 maven.dashboard.aggregator.csfiles.goal = checkstyle
 maven.dashboard.aggregator.csfiles.description = Number of files checked with Checkstyle
-maven.dashboard.aggregator.csfiles.report = checkstyle-report.html
+maven.dashboard.aggregator.csfiles.report = checkstyle/index.html
 
 # Properties for the Checkstyle error/warning aggregator (all errors/warnings)
 maven.dashboard.aggregator.csall.script = ${maven.dashboard.aggregators.dir}/csall.jelly
@@ -108,7 +108,7 @@ maven.dashboard.aggregator.csall.artifact = ${maven.build.dir}/checkstyle-raw-re
 maven.dashboard.aggregator.csall.label = CS err/warn
 maven.dashboard.aggregator.csall.goal = checkstyle
 maven.dashboard.aggregator.csall.description = Number of Checkstyle errors and warnings
-maven.dashboard.aggregator.csall.report = checkstyle-report.html
+maven.dashboard.aggregator.csall.report = checkstyle/index.html
 
 # Properties for the Checkstyle error aggregator (only errors)
 maven.dashboard.aggregator.cserrors.script = ${maven.dashboard.aggregators.dir}/cserrors.jelly
@@ -116,7 +116,7 @@ maven.dashboard.aggregator.cserrors.artifact = ${maven.build.dir}/checkstyle-raw
 maven.dashboard.aggregator.cserrors.label = CS errors
 maven.dashboard.aggregator.cserrors.goal = checkstyle
 maven.dashboard.aggregator.cserrors.description = Number of Checkstyle errors
-maven.dashboard.aggregator.cserrors.report = checkstyle-report.html
+maven.dashboard.aggregator.cserrors.report = checkstyle/index.html
 
 # Properties for the Checkstyle warning aggregator (only warnings)
 maven.dashboard.aggregator.cswarnings.script = ${maven.dashboard.aggregators.dir}/cswarnings.jelly
@@ -124,7 +124,7 @@ maven.dashboard.aggregator.cswarnings.artifact = ${maven.build.dir}/checkstyle-r
 maven.dashboard.aggregator.cswarnings.label = CS warnings
 maven.dashboard.aggregator.cswarnings.goal = checkstyle
 maven.dashboard.aggregator.cswarnings.description = Number of Checkstyle warnings
-maven.dashboard.aggregator.cswarnings.report = checkstyle-report.html
+maven.dashboard.aggregator.cswarnings.report = checkstyle/index.html
 
 # Properties for the Clover TPC aggregator (TPC = Total Percent Coverage)
 maven.dashboard.aggregator.clovertpc.script = ${maven.dashboard.aggregators.dir}/clovertpc.jelly
diff --git a/dashboard/src/plugin-test/maven.xml b/dashboard/src/plugin-test/maven.xml
index 839edb47..34dd13a3 100644
--- a/dashboard/src/plugin-test/maven.xml
+++ b/dashboard/src/plugin-test/maven.xml
@@ -108,7 +108,7 @@
     <!-- Subproject1 has report: we check that the link to the report exist -->
     <ant:echo>Check that testIndividualReportsNotGeneratedByDashboard has a link to the checkstyle report</ant:echo>
     <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[2]/a/@href)"/>
-    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/checkstyle-report.html" value="${URL}"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/checkstyle/index.html" value="${URL}"/>
     <!-- testIndividualReportsGeneratedByDashboard has no HTML report generated (there are no 
          reports defined in subproject2's project.xml): we check that the link to the report does 
          not exist -->
@@ -121,19 +121,19 @@
     <!-- csall -->
     <ant:echo>  Check csallreport</ant:echo>
     <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[2]/a/@href)"/>
-    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/checkstyle-report.html" value="${URL}"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/checkstyle/index.html" value="${URL}"/>
     <!-- cserrors -->
     <ant:echo>  Check cserrors report</ant:echo>
     <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[3]/a/@href)"/>
-    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/checkstyle-report.html" value="${URL}"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/checkstyle/index.html" value="${URL}"/>
     <!-- cswarnings -->
     <ant:echo>  Check cswarnings report</ant:echo>
     <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[4]/a/@href)"/>
-    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/checkstyle-report.html" value="${URL}"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/checkstyle/index.html" value="${URL}"/>
     <!-- csfiles -->
     <ant:echo>  Check csfiles report</ant:echo>
     <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[5]/a/@href)"/>
-    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/checkstyle-report.html" value="${URL}"/>
+    <assert:assertEquals expected="multiproject/testIndividualReportsNotGeneratedByDashboard/checkstyle/index.html" value="${URL}"/>
     <!-- clovertpc -->
     <ant:echo>  Check clovertpc report</ant:echo>
     <x:set var="URL" select="string($doc/document/body/section/table/tr[3]/td[6]/table/tr/td/a/@href)"/>
diff --git a/dashboard/xdocs/changes.xml b/dashboard/xdocs/changes.xml
index 1c16757c..1a0b63b3 100644
--- a/dashboard/xdocs/changes.xml
+++ b/dashboard/xdocs/changes.xml
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.9-SNAPSHOT" date="in svn">
+      <action dev="aheritier" type="update">Update the default checkstyle report location to make it compatible with Checkstyle plugin 3.0+ (MPCHECKSTYLE-40).</action>
       <action dev="carlos" type="add" issue="MPDASHBOARD-31">Added Cobertura aggregator.</action>
       <action dev="vmassol" type="fix" issue="MPDASHBOARD-27">
         Properties <code>maven.dashboard.basedir</code>,