diff --git a/cruisecontrol/plugin.jelly b/cruisecontrol/plugin.jelly
index 8e74865e..800ed301 100644
--- a/cruisecontrol/plugin.jelly
+++ b/cruisecontrol/plugin.jelly
@@ -22,7 +22,8 @@
     xmlns:j="jelly:core" 
     xmlns:util="jelly:util" 
     xmlns:x="jelly:xml" 
-    xmlns:ant="jelly:ant">
+    xmlns:ant="jelly:ant"
+    xmlns:doc="doc">
 
   <goal name="cruisecontrol" prereqs="cruisecontrol:configure"/>
 
@@ -84,5 +85,22 @@
       <arg line="-configfile ${maven.cruisecontrol.config}"/>
     </ant:java>
   </goal>
+
+  <goal name="maven-cruisecontrol-plugin:report">
+    <!-- TODO: download and transform instead of linking to it -->
+  </goal>
+
+  <goal name="maven-cruisecontrol-plugin:register">
+    <doc:registerReport 
+      name="CC Build Results"
+      pluginName="maven-cruisecontrol-plugin"
+      externalLink="${maven.cruisecontrol.buildresults.url}/${pom.artifactId}"
+      description="See the cruise control build results page for this project." />
+  </goal>
+  
+  <goal name="maven-cruisecontrol-plugin:deregister">
+    <doc:deregisterReport name="CC Build Results"/>
+  </goal>
+  
 </project>
 
diff --git a/cruisecontrol/plugin.properties b/cruisecontrol/plugin.properties
index 20f52fdd..cd63abc1 100644
--- a/cruisecontrol/plugin.properties
+++ b/cruisecontrol/plugin.properties
@@ -23,3 +23,4 @@ maven.cruisecontrol.mail.host=localhost
 maven.cruisecontrol.mail.defaultsuffix=DEFAULT_SUFFIX_NOT_SET
 maven.cruisecontrol.mail.subjectprefix=[BUILD]
 maven.cruisecontrol.template=${plugin.resources}/cruisecontrol.jsl
+maven.cruisecontrol.buildresults.url=http://localhost:8080/cruisecontrol
diff --git a/cruisecontrol/project.properties b/cruisecontrol/project.properties
deleted file mode 100644
index d66f96c3..00000000
--- a/cruisecontrol/project.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# -------------------------------------------------------------------
-# Copyright 2001-2004 The Apache Software Foundation.
-# 
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# 
-#      http://www.apache.org/licenses/LICENSE-2.0
-#  
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# -------------------------------------------------------------------
-
-# -------------------------------------------------------------------
-# P R O J E C T  P R O P E R T I E S
-# -------------------------------------------------------------------