diff --git a/jboss/plugin.jelly b/jboss/plugin.jelly
index bba1a528..0526a36a 100644
--- a/jboss/plugin.jelly
+++ b/jboss/plugin.jelly
@@ -92,7 +92,7 @@
     description="Creates a specific JBoss server configuration"
     prereqs="jboss:init">
 
-    <!-- Copy the JBoss jars from an existing JBoss default server
+    <!-- Copy the JBoss lib jars from an existing JBoss default server
          configuration to our specific configuration -->
     <ant:copy todir="${maven.jboss.build.lib.dir}">
       <ant:fileset dir="${maven.jboss.default.lib.dir}"
@@ -100,6 +100,16 @@
         excludes="${maven.jboss.default.lib.excludes}"/>
     </ant:copy>
 
+    <!-- Copy user-specific lib jars defined in project.xml and tagged with
+         <jboss.lib.bundle> -->
+    <j:forEach var="lib" items="${pom.artifacts}">
+      <j:set var="dep" value="${lib.dependency}"/>
+      <j:if test="${dep.getProperty('jboss.lib.bundle') == 'true'}">
+        <ant:echo>Bundling: (${dep.groupId}, ${dep.artifactId}, ${dep.type})</ant:echo>
+        <ant:copy todir="${maven.jboss.build.lib.dir}" file="${lib.path}"/>
+      </j:if>
+    </j:forEach>
+
     <!-- Copy the JBoss default conf files from an existing JBoss
     	 server configuration to our specific configuration -->
     <ant:copy todir="${maven.jboss.build.conf.dir}">
diff --git a/jboss/xdocs/changes.xml b/jboss/xdocs/changes.xml
index 602b89f1..694116fe 100644
--- a/jboss/xdocs/changes.xml
+++ b/jboss/xdocs/changes.xml
@@ -8,6 +8,10 @@
   <body>
 
     <release version="1.4" date="in CVS">
+      <action dev="vmassol" type="add" issue="MPJBOSS-6">
+        Added feature to add custom lib jars to the JBoss configuration
+        created when using the <code>jboss:configure</code> goal.
+      </action>
       <action dev="vmassol" type="fix" issue="MPJBOSS-3" due-to="Archimedes Trajano">
         Fixed deploy/undeploy URLs for JBoss 3.2.
       </action>
diff --git a/jboss/xdocs/goals.xml b/jboss/xdocs/goals.xml
index 27263792..42d0c942 100644
--- a/jboss/xdocs/goals.xml
+++ b/jboss/xdocs/goals.xml
@@ -17,7 +17,10 @@
         <name>jboss:configure</name>
         <description>
           Creates a custom JBoss server configuration directory structure
-          (with no J2EE modules deployed in it).
+          (with no J2EE modules deployed in it). Custom lib jars can be
+          specified in the <code>project.xml</code> by taggin them with
+          the <code>&lt;jboss.lib.bundle&gt;true&lt;/jboss.lib.bundle&gt;</code> 
+          property.
         </description>
       </goal>
       <goal>
