diff --git a/multiproject/plugin.jelly b/multiproject/plugin.jelly
index d39b5f4a..3547ea6c 100644
--- a/multiproject/plugin.jelly
+++ b/multiproject/plugin.jelly
@@ -102,14 +102,18 @@
         template="navigation-${navType}.xml"/>
     </j:if>
 
-    <!-- FIXME - this should just use the default in maven.docs.src -->
-    <util:file var="userNavTemplate" name="${basedir}/multiproject/navigation.xml"/>
+    <j:set var="maven.docs.src"
+      value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.src')}/navigation.xml" />
+    <j:set var="userNav" value="${maven.docs.src}/navigation.xml" />
+
+    <!-- FIXME: Will the xdoc stuff screw this up?? -->
+    <util:file var="userNavTemplate" name="${userNav}"/>
     <j:if test="${userNavTemplate.exists()}">
       <echo>Producing user supplied navigation...</echo> 
 
       <velocity:merge 
         name="${maven.gen.docs}/navigation.xml"
-        basedir="${basedir}/multiproject"
+        basedir="${maven.docs.src}"
         template="navigation.xml"/>
     </j:if>
 
@@ -140,7 +144,7 @@ maven -Dgoal=clean multiproject:goal</m:param-check>
   <goal name="multiproject:artifact"
     description=" Builds all artifacts for all subproject">
 
-    <j:set var="goal" name="multiproject:artifact-callback"/>
+    <j:set var="goal" value="multiproject:artifact-callback"/>
     <attainGoal name="multiproject:goal"/>
 
   </goal>
@@ -156,7 +160,7 @@ maven -Dgoal=clean multiproject:goal</m:param-check>
   <goal name="multiproject:install"
     description="Run 'artifact':install for all subprojects">
 
-    <j:set var="goal" name="multiproject:install-callback"/>
+    <j:set var="goal" value="multiproject:install-callback"/>
     <attainGoal name="multiproject:goal"/>
   </goal>
   
@@ -170,7 +174,7 @@ maven -Dgoal=clean multiproject:goal</m:param-check>
   <goal name="multiproject:install-snapshot"
     description="Run 'artifact':install-snapshot for all subprojects">
 
-    <j:set var="goal" name="multiproject:install-snapshot-callback"/>
+    <j:set var="goal" value="multiproject:install-snapshot-callback"/>
     <attainGoal name="multiproject:goal"/>
   </goal>
   
@@ -184,7 +188,7 @@ maven -Dgoal=clean multiproject:goal</m:param-check>
    <goal name="multiproject:deploy"
     description="Run 'artifact':deploy for all subprojects">
 
-    <j:set var="goal" name="multiproject:deploy-callback"/>
+    <j:set var="goal" value="multiproject:deploy-callback"/>
     <attainGoal name="multiproject:goal"/>
   </goal>
   
@@ -198,7 +202,7 @@ maven -Dgoal=clean multiproject:goal</m:param-check>
   <goal name="multiproject:deploy-snapshot"
     description="Run 'artifact':deploy-snapshot for all subprojects">
 
-    <j:set var="goal" name="multiproject:deploy-snapshot-callback"/>
+    <j:set var="goal" value="multiproject:deploy-snapshot-callback"/>
     <attainGoal name="multiproject:goal"/>
   </goal>