diff --git a/jbuilder/plugin.jelly b/jbuilder/plugin.jelly
index fcf55cdc..f8faf6fc 100644
--- a/jbuilder/plugin.jelly
+++ b/jbuilder/plugin.jelly
@@ -147,7 +147,7 @@
 
               <!-- Get optional library source path property. -->
               <j:set var="librarySourceProp" value="maven.jbuilder.${libraryName}.librarySource" />
-              <j:set var="librarySource" value="${context.getVariable(librarySourceProp)}" />
+              <j:set var="librarySource" value="${librarySourceProp}" />
 
 	            <j:file name="${libraryFile}" prettyPrint="true" xmlns="dummy">
                 <library>
diff --git a/jbuilder/project.xml b/jbuilder/project.xml
index 07c54e89..31be94ec 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.4</currentVersion>
+  <currentVersion>1.5-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 bd1ce9a0..622478f4 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.5" date="In CVS">
+      <action dev="evenisse" type="fix" issue="MPJBUILDER-9">Fix crash with Maven RC2.</action>
+    </release>
     <release version="1.4" date="2004-03-10">
       <action dev="evenisse" type="fix" issue="MPJBUILDER-8">Generate relative path for OutPath, DefaultPath, DocPath, SourcePath, and TestPath tag in jbuilder project.</action>
       <action dev="dion" type="fix">Apply MAVEN-987</action>
