diff --git a/cruisecontrol/plugin.jelly b/cruisecontrol/plugin.jelly
index 6e0597b7..4c73de6a 100644
--- a/cruisecontrol/plugin.jelly
+++ b/cruisecontrol/plugin.jelly
@@ -130,7 +130,12 @@
     </j:choose>
   </goal>
 
-  <goal name="cruisecontrol:install-local" prereqs="cruisecontrol:configure">
+  <!--==================================================================-->
+  <!-- Install the generated CruiseControl configuration on the same    -->
+  <!-- machine in the ${maven.cruisecontrol.work.dir} directory.        -->
+  <!--==================================================================-->    
+  <goal name="cruisecontrol:install-local" prereqs="cruisecontrol:configure"
+      description="Perform a local installation of the generated CruiseControl configuration">
 
     <!-- Only deploy if the work dir property has been set to a location
          different than the default -->
@@ -158,6 +163,31 @@
     -->
   </goal>
 
+  <!--==================================================================-->
+  <!-- Configure the CruiseControl Webapp WAR and generate a fully      -->
+  <!-- configured WAR ready to be used.                                 -->
+  <!--==================================================================-->    
+  <goal name="cruisecontrol:configure-war" prereqs="cruisecontrol:validate"
+      description="Generate a configured CruiseControl Webapp WAR">
+
+    <ant:unwar src="${maven.cruisecontrol.home}/reporting/jsp/dist/cruisecontrol.war" 
+        dest="${maven.cruisecontrol.build.dir}/cruisecontrolwar"/>
+
+    <!-- Modify the web.xml file -->
+    <ant:replace file="${maven.cruisecontrol.build.dir}/cruisecontrolwar/WEB-INF/web.xml"
+      token="&lt;param-value&gt;logs&lt;/param-value&gt;"
+      value="&lt;param-value&gt;${maven.cruisecontrol.logs.dir}&lt;/param-value&gt;"/>
+    <ant:replace file="${maven.cruisecontrol.build.dir}/cruisecontrolwar/WEB-INF/web.xml"
+      token="&lt;param-value&gt;status.txt&lt;/param-value&gt;"
+      value="&lt;param-value&gt;${maven.cruisecontrol.currentbuildstatus.filename}&lt;/param-value&gt;"/>
+
+    <ant:war destfile="${maven.cruisecontrol.build.dir}/cruisecontrol.war" 
+        basedir="${maven.cruisecontrol.build.dir}/cruisecontrolwar"
+        webxml="${maven.cruisecontrol.build.dir}/cruisecontrolwar/WEB-INF/web.xml"
+        excludes="**/web.xml"/>
+
+  </goal>
+  
   <goal name="maven-cruisecontrol-plugin:report">
     <!-- TODO: download and transform instead of linking to it -->
   </goal>
diff --git a/cruisecontrol/xdocs/changes.xml b/cruisecontrol/xdocs/changes.xml
index fc1fa173..38770b3f 100644
--- a/cruisecontrol/xdocs/changes.xml
+++ b/cruisecontrol/xdocs/changes.xml
@@ -26,6 +26,10 @@
   </properties>
   <body>
     <release version="1.7" date="in SVN">
+      <action dev="vmassol" type="add">
+        Added new <code>cruisecontrol:configure-war</code> goal that generates
+        a configured CruiseControl webapp WAR.
+      </action>
       <action dev="vmassol" type="update">
         Use the same default value for the 
         <code>maven.cruisecontrol.mail.buildresultsurl</code> property
diff --git a/cruisecontrol/xdocs/goals.xml b/cruisecontrol/xdocs/goals.xml
index 2355ab71..b16d4eba 100644
--- a/cruisecontrol/xdocs/goals.xml
+++ b/cruisecontrol/xdocs/goals.xml
@@ -43,6 +43,12 @@
           machine (it uses a file copy).
         </description>
       </goal>
+      <goal>
+        <name>cruisecontrol:configure-war</name>
+        <description>
+          Generates a configured CruiseControl webapp WAR.
+        </description>
+      </goal>
     </goals>
   </body>
 </document>
