diff --git a/jbuilder/plugin.jelly b/jbuilder/plugin.jelly
index d08c269e..bbb0a13f 100644
--- a/jbuilder/plugin.jelly
+++ b/jbuilder/plugin.jelly
@@ -109,7 +109,8 @@
                  maven dependency (i.e. by this tag) -->
             <j:set var="mavenGenerated" value="false" />
             <j:if test="${libraryExists}" >
-              <x:parse var="doc" xml="${libraryFile}"/>
+              <u:file var="libraryFileFile" name="${libraryFile}"/>
+              <x:parse var="doc" xml="${libraryFileFile}"/>
               <x:set var="root" select="$doc/*" />
               <x:set var="mavenElement" select="$root/maven-generated" />
               <j:if test="${!mavenElement.isEmpty()}" >
@@ -240,7 +241,7 @@
       <j:set var="docPath" value="${maven.jbuilder.docpath}" />
     </j:if>
     <j:set var="outPath"          value="${maven.jbuilder.outpath}" />
-    <j:set var="jdk"              value="java ${java.vm.version}" />
+    <j:set var="jdk"              value="java version ${java.vm.version}" />
     <j:set var="titleLabel"       value="Title: " />
     <j:set var="versionLabel"     value="@version" />
     <j:set var="workingDir"       value="." />
@@ -282,6 +283,7 @@
       <j:set var="descriptionLabel" value="${defaultProps.getProperty('sys[0].DescriptionLabel')}" />
       <j:set var="titleLabel"       value="${defaultProps.getProperty('sys[0].TitleLabel')}" />
       <j:set var="versionLabel"     value="${defaultProps.getProperty('sys[0].VersionLabel')}" />
+      <j:set var="jdk"              value="${defaultProps.getProperty('sys[0].JDK')}" />
       <available property="jdkDefPresent" file="${jbUserHome}/${jdk}.library" />
       <j:if test="${!jdkDefPresent}">
         <ant:echo>+------------------------------------------------------------------</ant:echo>
@@ -371,9 +373,12 @@
       <!-- This goal forces the test plugin to be loaded.
            TODO: In Maven beta 9, use the special test:eclipse tag instead. -->
       <attainGoal name="test:prepare-filesystem" />
-      <j:set
-        var="junitArtifact"
-        value="${pom.getPluginContext('maven-test-plugin').getVariable('plugin').getArtifact('junit')}" />
+      <j:set var="testPluginProject" value="${pom.getPluginContext('maven-test-plugin').getVariable('plugin')}"/>
+      <j:forEach var="testPluginArtifact" items="${testPluginProject.artifacts}">
+        <j:if test="${testPluginArtifact.dependency.artifactId == 'junit'}">
+          <j:set var="junitArtifact" value="${testPluginArtifact}"/>
+        </j:if>
+      </j:forEach>
       <jbuilder:generateArtifactLibrary
         artifact="${junitArtifact}"
         userHome="${jbUserHome}"
diff --git a/jbuilder/project.xml b/jbuilder/project.xml
index 08aa4f99..3bf04507 100644
--- a/jbuilder/project.xml
+++ b/jbuilder/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jbuilder-plugin</id>
   <name>Maven JBuilder Plug-in</name>
-  <currentVersion>1.3</currentVersion>
+  <currentVersion>1.4-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 d658fad5..19ac1404 100644
--- a/jbuilder/xdocs/changes.xml
+++ b/jbuilder/xdocs/changes.xml
@@ -6,6 +6,12 @@
   </properties>
 
   <body>
+    <release version="1.4" date="in CVS">
+      <action dev="dion" type="fix">
+        Apply MAVEN-987
+      </action>
+    </release>
+    
     <release version="1.3" date="2003-09-29">
       <action dev="evenisse" type="fix" due-to="David Zeleznik">
           Fix MAVEN-781.