diff --git a/jbuilder/plugin.jelly b/jbuilder/plugin.jelly
index ab6be3a5..c3fbc501 100644
--- a/jbuilder/plugin.jelly
+++ b/jbuilder/plugin.jelly
@@ -1,7 +1,8 @@
 <?xml version="1.0"?>
 
 <project 
-  xmlns:j="jelly:core">
+  xmlns:j="jelly:core"
+  xmlns:x="jelly:xml">
 
   <!--==================================================================-->
   <!-- Generate JBuilder [id_project].library files                     -->
@@ -17,7 +18,7 @@
 	  <j:file name="${basedir}/${pom.artifactId}.library" prettyPrint="true" xmlns="dummy">
 	  
 	  <library>
-      <!--JBuilder Library Definition File-->
+      <x:comment>JBuilder Library Definition File</x:comment>
       <fullname>${pom.artifactId}</fullname>
       <class>
         <j:if test="${maven.has.jar.resource.patterns}">
@@ -47,26 +48,26 @@
     
     <echo>Creating ${basedir}/${pom.artifactId}.jpx ...</echo>
 	  <j:file name="${basedir}/${pom.artifactId}.jpx" prettyPrint="true" xmlns="dummy">
-  	  <!--Projet XML JBuilder-->
+  	  <x:comment>Projet XML JBuilder</x:comment>
   	  <project>
-    	  <property category="sys" name="AuthorLabel" value="@author"/>
+    	<property category="sys" name="AuthorLabel" value="@author"/>
   	    <property category="sys" name="BackupPath" value="bak"/>
-    	  <property category="sys" name="Company" value=""/>
-    	  <property category="sys" name="CompanyLabel" value="Company :"/>
-    	  <property category="sys" name="Copyright" value="Copyright (c) ${pom.inceptionYear} - ${pom.organization.name}"/>
-    	  <property category="sys" name="CopyrightLabel" value="Copyright :"/>
+    	<property category="sys" name="Company" value=""/>
+    	<property category="sys" name="CompanyLabel" value="Company :"/>
+    	<property category="sys" name="Copyright" value="Copyright (c) ${pom.inceptionYear} - ${pom.organization.name}"/>
+    	<property category="sys" name="CopyrightLabel" value="Copyright :"/>
   	    <property category="sys" name="DefaultPath" value="${pom.build.sourceDirectory}"/>
-    	  <property category="sys" name="Description" value=""/>
-    	  <property category="sys" name="DescriptionLabel" value="Description :"/>
-    	  <property category="sys" name="DocPath" value="doc"/>
-    	  <property category="sys" name="IncludeTestPath" value="1"/>
-    	  <property category="sys" name="OutPath" value="target/classes"/>
-    	  <property category="sys" name="SourcePath" value="${pom.build.sourceDirectory};${pom.build.unitTestSourceDirectory}"/>
-    	  <property category="sys" name="TestPath" value="${pom.build.unitTestSourceDirectory}"/>
+    	<property category="sys" name="Description" value=""/>
+    	<property category="sys" name="DescriptionLabel" value="Description :"/>
+    	<property category="sys" name="DocPath" value="doc"/>
+    	<property category="sys" name="IncludeTestPath" value="1"/>
+    	<property category="sys" name="OutPath" value="target/classes"/>
+    	<property category="sys" name="SourcePath" value="${pom.build.sourceDirectory};${pom.build.unitTestSourceDirectory}"/>
+    	<property category="sys" name="TestPath" value="${pom.build.unitTestSourceDirectory}"/>
   	    <property category="sys" name="Title" value=""/>
-    	  <property category="sys" name="TitleLabel" value="Title :"/>
-    	  <property category="sys" name="Version" value="${pom.currentVersion}"/>
-    	  <property category="sys" name="VersionLabel" value="@version"/>
+    	<property category="sys" name="TitleLabel" value="Title :"/>
+    	<property category="sys" name="Version" value="${pom.currentVersion}"/>
+    	<property category="sys" name="VersionLabel" value="@version"/>
   	    <property category="sys" name="WorkingDirectory" value="."/>
   	  </project>
   	</j:file>	
diff --git a/jbuilder/project.xml b/jbuilder/project.xml
index fa3980d7..e6bf9ca8 100644
--- a/jbuilder/project.xml
+++ b/jbuilder/project.xml
@@ -40,6 +40,13 @@
     </developer>
   </developers>
   
-  <dependencies/>
+  <dependencies>
+    <dependency>
+      <groupId>commons-jelly</groupId>
+      <artifactId>commons-jelly-tags-xml</artifactId>
+      <version>SNAPSHOT</version>
+      <url>http://jakarta.apache.org/commons/sandbox/jelly/tags/xml/</url>
+    </dependency>
+  </dependencies>
 
 </project>