diff --git a/jboss/plugin.jelly b/jboss/plugin.jelly
index aa57e3dd..02e90be5 100644
--- a/jboss/plugin.jelly
+++ b/jboss/plugin.jelly
@@ -19,7 +19,7 @@
   -->
   <goal name="jboss" 
     description="Creates a specific JBoss server configuration"
-    prereqs="jboss:package"/>
+    prereqs="jboss:configure"/>
 
   <!--
      ========================================================================
@@ -50,17 +50,12 @@
 
   <!--
      ========================================================================
-       Creates a JBoss server configuration directory structure, packaging
-       the application EAR in it.
+       Creates a custom JBoss server configuration directory structure.
      ========================================================================
   -->
-  <goal name="jboss:package" 
+  <goal name="jboss:configure" 
     description="Creates a specific JBoss server configuration"
-    prereqs="ear:ear,jboss:init">
-
-    <!-- Copy the EAR to install to the JBoss deploy dir. -->
-    <copy file="${maven.build.dir}/${maven.final.name}.ear"
-      todir="${maven.jboss.build.deploy.dir}"/>
+    prereqs="jboss:init">
 
     <!-- Copy the JBoss jars from an existing JBoss default server
          configuration to our specific configuration -->
@@ -121,6 +116,59 @@
 
   </goal>
 
+  <!--
+     ========================================================================
+       Creates a custom JBoss server configuration directory structure,
+       packaging an EAR in it.
+     ========================================================================
+  -->
+  <goal name="jboss:package-ear" 
+    description="Creates a specific JBoss server configuration (with EAR)"
+    prereqs="jboss:init,ear:ear,jboss:configure">
+
+    <!-- Copy the EAR to install to the JBoss deploy dir. -->
+    <copy file="${maven.build.dir}/${maven.final.name}.ear"
+      todir="${maven.jboss.build.deploy.dir}"/>
+
+  </goal>
+
+  <!--
+     ========================================================================
+       Creates a custom JBoss server configuration directory structure,
+       packaging a WAR in it.
+     ========================================================================
+  -->
+  <goal name="jboss:package-war" 
+    description="Creates a specific JBoss server configuration (with WAR)"
+    prereqs="jboss:init,war:war,jboss:configure">
+
+    <j:set var="warBuildDir"
+      value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.build.dir')}"/>
+    <j:set var="warFinalName"
+      value="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.final.name')}"/>
+
+    <!-- Copy the WAR to install to the JBoss deploy dir. -->
+    <copy file="${warBuildDir}/${warFinalName}"
+      todir="${maven.jboss.build.deploy.dir}"/>
+
+  </goal>
+
+  <!--
+     ========================================================================
+       Creates a custom JBoss server configuration directory structure,
+       packaging an EJB-JAR in it.
+     ========================================================================
+  -->
+  <goal name="jboss:package-ejb" 
+    description="Creates a specific JBoss server configuration (with EJB-JAR)"
+    prereqs="jboss:init,ejb:ejb,jboss:configure">
+
+    <!-- Copy the EJB-JAR to install to the JBoss deploy dir. -->
+    <copy file="${maven.build.dir}/${maven.final.name}.jar"
+      todir="${maven.jboss.build.deploy.dir}"/>
+
+  </goal>
+  
   <!--
      ========================================================================
        Start JBoss using our specific server configuration.
diff --git a/jboss/sample/maven.xml b/jboss/sample/maven.xml
index f7d40a72..d66522dc 100644
--- a/jboss/sample/maven.xml
+++ b/jboss/sample/maven.xml
@@ -5,7 +5,7 @@
 -->
 <project>
 
-  <preGoal name="jboss:package">
+  <preGoal name="jboss:configure">
     <copy todir="target/appconf">
       <fileset dir="conf/${env.name}/application"/>
     </copy>
diff --git a/jboss/xdocs/changes.xml b/jboss/xdocs/changes.xml
index 9c2ae236..1dde786f 100644
--- a/jboss/xdocs/changes.xml
+++ b/jboss/xdocs/changes.xml
@@ -8,6 +8,15 @@
   <body>
 
     <release version="1.1" date="in CVS">
+      <action dev="vmassol" type="update">
+        Allowed deployments of EAR, WAR or EJB-JAR (only EAR was previously 
+        supported) by adding the <code>jboss:package-ear</code>, 
+        <code>jboss:package-ejb</code> and <code>jboss:package-war</code>
+        goals. The <code>jboss:package</code> goal has been renamed
+        <code>jboss:configure</code> and now simply creates a 
+        custom JBoss server configuration (with nothing from the project 
+        deployed in it).        
+      </action>
       <action dev="vmassol" type="add" due-to="James Johnson" due-to-email="jcej@tragus.org">
         Added deploy/undeploy targets for jar/war/ear using JBoss' jmx console.
       </action>
diff --git a/jboss/xdocs/goals.xml b/jboss/xdocs/goals.xml
index 6c29f3ff..488a7d1c 100644
--- a/jboss/xdocs/goals.xml
+++ b/jboss/xdocs/goals.xml
@@ -8,10 +8,30 @@
   <body>
     <goals>
       <goal>
-        <name>jboss:package</name>
+        <name>jboss:configure</name>
         <description>
-          Creates a JBoss server configuration directory structure, packaging
-          the application EAR in it.
+          Creates a custom JBoss server configuration directory structure.
+        </description>
+      </goal>
+      <goal>
+        <name>jboss:package-ear</name>
+        <description>
+          Creates a custom JBoss server configuration directory structure
+          and deploys an EAR in it.
+        </description>
+      </goal>
+      <goal>
+        <name>jboss:package-ejb</name>
+        <description>
+          Creates a custom JBoss server configuration directory structure
+          and deploys an EJB-JAR in it.
+        </description>
+      </goal>
+      <goal>
+        <name>jboss:package-war</name>
+        <description>
+          Creates a custom JBoss server configuration directory structure
+          and deploys a WAR in it.
         </description>
       </goal>
       <goal>