diff --git a/cruisecontrol/plugin.properties b/cruisecontrol/plugin.properties
index 32339cda..9107cdfa 100644
--- a/cruisecontrol/plugin.properties
+++ b/cruisecontrol/plugin.properties
@@ -35,8 +35,8 @@ maven.cruisecontrol.mail.reportsuccess=always
 maven.cruisecontrol.mail.spamwhilebroken=false
 maven.cruisecontrol.mail.usemap=true
 maven.cruisecontrol.mail.buildresultsurl=
-maven.cruisecontrol.mail.css=${maven.cruisecontrol.home}/reporting/jsp/css/cruisecontrol.css
-maven.cruisecontrol.mail.xlsdir=${maven.cruisecontrol.home}/reporting/jsp/xsl
+maven.cruisecontrol.mail.css=${maven.cruisecontrol.home}/reporting/jsp/webcontent/css/cruisecontrol.css
+maven.cruisecontrol.mail.xlsdir=${maven.cruisecontrol.home}/reporting/jsp/webcontent/xsl
 maven.cruisecontrol.mail.failureaddress=${pom.build.nagEmailAddress}
 maven.cruisecontrol.mail.successaddress=${pom.build.nagEmailAddress}
 maven.cruisecontrol.mail.maps=
diff --git a/cruisecontrol/xdocs/changes.xml b/cruisecontrol/xdocs/changes.xml
index 6cb3aca6..8d97d794 100644
--- a/cruisecontrol/xdocs/changes.xml
+++ b/cruisecontrol/xdocs/changes.xml
@@ -30,6 +30,11 @@
         elements are generated. They must be in the order of the less
         dependent project first.        
       </action>
+      <action dev="vmassol" type="fix">
+        Fixed default property values for <code>maven.cruisecontrol.mail.xlsdir</code>
+        and <code>maven.cruisecontrol.mail.css</code> so that the plugin works by default
+        with the latest CC version (2.2.1).
+      </action>
     </release>
     <release version="1.6" date="2004-12-06">
       <action dev="epugh" type="add" issue="MPCRUISECONTROL-15">Lost script extension when use "maven cruisecontrol:configure" command</action>