diff --git a/caller/plugin.jelly b/caller/plugin.jelly
index 4bf6f010..afe6bd46 100644
--- a/caller/plugin.jelly
+++ b/caller/plugin.jelly
@@ -11,19 +11,27 @@
          <caller:call goalInterface="compile-java"/>
     -->       
     <define:tag name="call">                  
+
       <j:set var="callProperty" value="maven.caller.call.${goalInterface}"/>
+
       <!-- Search first in the caller's context -->
       <j:set var="goalName" 
         value="${context.findVariable(callProperty)}"/>
+
       <j:if test="${goalName == null}">
+
         <!-- Search in this plugin context -->
         <j:set var="goalName" 
-          value="${plugin.context.findVariable(callProperty)}"/>
+          value="${pom.getPluginContext('maven-caller-plugin').findVariable(callProperty)}"/>
+
       </j:if>
+
       <j:if test="${goalName == null}">
         <ant:fail message="Property [maven.caller.call.${goalInterface}] is not defined"/>
       </j:if>
+
       <attainGoal name="${goalName}"/>
+
     </define:tag>
 
     <!-- Example of usage:
diff --git a/caller/project.xml b/caller/project.xml
index 5603361c..d240bc80 100644
--- a/caller/project.xml
+++ b/caller/project.xml
@@ -5,14 +5,14 @@
   <pomVersion>3</pomVersion>
   <id>maven-caller-plugin</id>
   <name>Maven Caller Plugin</name>
-  <currentVersion>1.0-SNAPSHOT</currentVersion>
+  <currentVersion>1.0</currentVersion>
   <description>Interface to isolate calls between plugins</description>
   <shortDescription>Maven Caller plugin</shortDescription>
   <url>http://maven.apache.org/reference/plugins/caller/</url>
   <siteDirectory>/www/maven.apache.org/reference/plugins/caller/</siteDirectory>
   <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/caller/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/caller/</url>
+    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven-plugins/caller/</connection>
+    <url>http://cvs.apache.org/viewcvs/maven-plugins/caller/</url>
   </repository>
   <developers>
     <developer>
diff --git a/caller/xdocs/changes.xml b/caller/xdocs/changes.xml
index 26310df2..3c3e9241 100644
--- a/caller/xdocs/changes.xml
+++ b/caller/xdocs/changes.xml
@@ -6,7 +6,7 @@
   </properties>
 
   <body>
-    <release version="1.0" date="in CVS">
+    <release version="1.0" date="2003-11-16">
       <action dev="vmassol" type="add">
         Initial creation of plugin.
       </action>
diff --git a/caller/xdocs/navigation.xml b/caller/xdocs/navigation.xml
index e748546e..e5e288a5 100644
--- a/caller/xdocs/navigation.xml
+++ b/caller/xdocs/navigation.xml
@@ -12,6 +12,9 @@
       <item name="Goals"      href="/goals.html" />
       <item name="Properties" href="/properties.html" />
     </menu>
+    <menu name="Downloads">
+      <item name="Caller plugin 1.0" href="http://www.ibiblio.org/maven/maven/plugins/maven-caller-plugin-1.0.jar"/>
+    </menu>
   </body>
 
 </project>