diff --git a/jxr/xdocs/goals.xml b/jxr/xdocs/goals.xml
index 06d8af5b..77fc8aea 100644
--- a/jxr/xdocs/goals.xml
+++ b/jxr/xdocs/goals.xml
@@ -30,9 +30,17 @@
         <description>Generate HTML cross reference sources</description>
       </goal>
       <goal>
-        <name>jxr:generate</name>
+        <name>maven-jxr-plugin:report</name>
         <description>Generate HTML cross reference sources</description>
       </goal>
+      <goal>
+        <name>maven-jxr-plugin:register</name>
+        <description>Registers the JXR report with the xdoc plugin</description>
+      </goal>
+      <goal>
+        <name>maven-jxr-plugin:deregister</name>
+        <description>Deregisters the JXR report from the xdoc plugin</description>
+      </goal>
     </goals>
   </body>
 </document>
\ No newline at end of file
diff --git a/jxr/xdocs/navigation.xml b/jxr/xdocs/navigation.xml
index 04739b98..1c77b771 100644
--- a/jxr/xdocs/navigation.xml
+++ b/jxr/xdocs/navigation.xml
@@ -29,6 +29,7 @@
       <item name="Maven 1.x plugins Sandbox" href="http://maven.apache.org/maven-1.x/plugins-sandbox/index.html"/>
       <item name="Continuum" href="http://maven.apache.org/continuum/index.html"/>
       <item name="Maven 2.0" href="http://maven.apache.org/"/>
+      <item name="JXR" href="http://maven.apache.org/jxr/"/>
     </links>
     <menu name="Overview">
       <item href="/goals.html" name="Goals">
diff --git a/jxr/xdocs/properties.xml b/jxr/xdocs/properties.xml
index 2479b696..3c1808bc 100644
--- a/jxr/xdocs/properties.xml
+++ b/jxr/xdocs/properties.xml
@@ -46,22 +46,6 @@
               <code>${plugin.dir}/templates</code>.</p>
           </td>
         </tr>
-        <tr>
-          <td>maven.conf.dir</td>
-          <td>Yes</td>
-          <td>
-            <p>Default value is
-              <code>${basedir}/conf</code>.</p>
-          </td>
-        </tr>
-        <tr>
-          <td>maven.gen.docs</td>
-          <td>Yes</td>
-          <td>
-            <p>Default value is
-              <code>${maven.build.dir}/generated-xdocs</code>.</p>
-          </td>
-        </tr>
         <tr>
           <td>maven.jxr.stylesheet</td>
           <td>Yes</td>
@@ -70,30 +54,6 @@
               <code>${plugin.dir}/stylesheet.css</code>.</p>
           </td>
         </tr>
-        <tr>
-          <td>maven.build.dest</td>
-          <td>Yes</td>
-          <td>
-            <p>Default value is
-              <code>${maven.build.dir}/classes</code>.</p>
-          </td>
-        </tr>
-        <tr>
-          <td>maven.docs.src</td>
-          <td>Yes</td>
-          <td>
-            <p>Default value is
-              <code>${basedir}/xdocs</code>.</p>
-          </td>
-        </tr>
-        <tr>
-          <td>maven.build.src</td>
-          <td>Yes</td>
-          <td>
-            <p>Default value is
-              <code>${maven.build.dir}/src</code>.</p>
-          </td>
-        </tr>
         <tr>
           <td>maven.build.dir</td>
           <td>Yes</td>
@@ -127,11 +87,11 @@
           </td>
         </tr>
         <tr>
-          <td>maven.src.dir</td>
+          <td>maven.jxr.destdir.test</td>
           <td>Yes</td>
           <td>
             <p>Default value is
-              <code>${basedir}/src</code>.</p>
+              <code>${maven.docs.dest}/xref-test</code>.</p>
           </td>
         </tr>
       </table>