diff --git a/jbuilder/plugin.jelly b/jbuilder/plugin.jelly
index 55ac1aa2..26b98613 100644
--- a/jbuilder/plugin.jelly
+++ b/jbuilder/plugin.jelly
@@ -300,7 +300,8 @@
     <j:set var="companyLabel"     value="Company: " />
     <j:set var="copyrightLabel"   value="Copyright: " />
     <j:set var="descriptionLabel" value="Description: " />
-    <maven:makeRelativePath var="relativeDocPath" basedir="${basedir}" path="${pom.getPluginContext('maven-javadoc-plugin').getVariable('maven.javadoc.destdir')}" />
+    <maven:get plugin="maven-javadoc-plugin" property="maven.javadoc.destdir" var="javadocsDest"/>
+    <maven:makeRelativePath var="relativeDocPath" basedir="${basedir}" path="${javadocsDest}" />
     <j:set var="docPath"          value="${relativeDocPath}" />
     <j:set var="docX" value="${maven.jbuilder.docpath}X" />
     <j:if test="${docX != 'X'}" >
diff --git a/jbuilder/project.xml b/jbuilder/project.xml
index c599bf22..9ebe1bd5 100644
--- a/jbuilder/project.xml
+++ b/jbuilder/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jbuilder-plugin</id>
   <name>Maven JBuilder Plug-in</name>
-  <currentVersion>1.5</currentVersion>
+  <currentVersion>1.6-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>JBuilder Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jbuilder/</url>
diff --git a/jbuilder/xdocs/changes.xml b/jbuilder/xdocs/changes.xml
index fad77d08..8ac7c33b 100644
--- a/jbuilder/xdocs/changes.xml
+++ b/jbuilder/xdocs/changes.xml
@@ -24,6 +24,9 @@
     <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
   </properties>
   <body>
+    <release version="1.6" date="In CVS">
+      <action dev="evenisse" type="fix" issue="MPJBUILDER-13">Remove use of pom.getPluginContext and replace with maven:set/get.</action>
+    </release>
     <release version="1.5" date="2004-05-15">
       <action dev="evenisse" type="add" issue="MPJBUILDER-11">Add maven.jbuilder.bakpath property.</action>
       <action dev="evenisse" type="add" issue="MPJBUILDER-10">Add xdocs and subdir into jbuilder folder(s).</action>
