diff --git a/jbuilder/plugin.jelly b/jbuilder/plugin.jelly
index 5eb69438..223f30d5 100644
--- a/jbuilder/plugin.jelly
+++ b/jbuilder/plugin.jelly
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 
 <project 
-  xmlns:j="jelly:core" 
-  xmlns:doc="doc">
+  xmlns:j="jelly:core">
 
   <!--==================================================================-->
   <!-- Generate JBuilder [id_project].library files                     -->
@@ -15,37 +14,32 @@
     description="Generate JBuilder [id_project].library file">
 
     <echo>Creating ${basedir}/${pom.artifactId}.library ...</echo>
-	  <j:file name="${basedir}/jbuilder_library.xml" prettyPrint="true" xmlns="dummy">
-      <classpath>
+	  <j:file name="${basedir}/${pom.artifactId}.library" prettyPrint="true" xmlns="dummy">
+	  
+	  <library>
+      <!--JBuilder Library Definition File-->
+      <fullname>${pom.artifactId}</fullname>
+      <class>
         <j:if test="${maven.has.jar.resource.patterns}">
-          <classpathentry path="${maven.jarResources.basedir}"/>
+          <path>${maven.jarResources.basedir}"</path>
         </j:if>
         <j:if test="${pom.build.testResources != null}">
           <j:forEach var="res" items="${pom.build.testResources}">
-            <classpathentry path="${res.directory}"/>
+            <path>${res.directory}</path>
           </j:forEach>
         </j:if>
         <j:if test="${pom.build.unitTest.resources != null}">
-          <classpathentry path="${pom.build.unitTestSourceDirectory}"/>
+          <path>${pom.build.unitTestSourceDirectory}</path>
         </j:if>
-        <j:forEach var="lib" items="${pom.dependencies}">
-          <classpathentry path="${maven.repo.local}/${lib.artifactDirectory}/jars/${lib.artifact}"/>
+        <j:forEach var="lib" items="${pom.artifacts}">
+          <!-- Had some problems with whitespace, so use j:expr -->
+          <path><j:expr value="${maven.repo.local}${lib.urlPath}"/></path>
         </j:forEach>
-      </classpath>
+      </class>
+      <required>${pom.artifactId}</required>
+    </library>
   	</j:file>	
-
-     <doc:jsl
-       input="${basedir}/jbuilder_library.xml"
-       output="${basedir}/${pom.artifactId}.library"
-       stylesheet="${plugin.resources}/library.jsl"
-       encoding="${maven.docs.outputencoding}"
-       omitXmlDeclaration="true"
-       outputMode="xml"
-       prettyPrint="true"
-     />
-
-    <delete file="${basedir}/jbuilder_library.xml"/>
-    
+  	
   </goal>
   
   <goal name="jbuilder:generate-project"
diff --git a/jbuilder/src/plugin-resources/library.jsl b/jbuilder/src/plugin-resources/library.jsl
deleted file mode 100644
index 34ca1cc1..00000000
--- a/jbuilder/src/plugin-resources/library.jsl
+++ /dev/null
@@ -1,17 +0,0 @@
-#match ("classpath")
-  #set( $mavenProject = $context.getAppValue("mavenProject") )
-<?xml version="1.0" encoding="UTF-8"?>
-
-<library>
-  <!--JBuilder Library Definition File-->
-  <fullname>$mavenProject.id</fullname>
-  <class>
-$context.applyTemplates("classpathentry")
-  </class>
-  <required>$mavenProject.id</required>
-</library>
-#end
-
-#match("classpathentry")
-  <path>[$attrib.path]</path>
-#end
\ No newline at end of file