diff --git a/gump/plugin.jelly b/gump/plugin.jelly
index 4c4c5c45..8a258a31 100644
--- a/gump/plugin.jelly
+++ b/gump/plugin.jelly
@@ -52,6 +52,12 @@
   <goal name="gump:generate-descriptor"
            description="Generate Gump descriptor from Maven descriptor">
 
+    <j:set var="genAnt" value="${maven.gump.ant.generate}" />
+    <j:set var="genMaven" value="${maven.gump.maven.generate}" />
+    <j:if test="${!genAnt and !genMaven}">
+      <fail>You must specify one of maven.gump.ant and maven.gump.maven</fail>
+    </j:if>
+
     <j:set var="gumpProject"><gump:name project="${pom.artifactId}"/></j:set>
     <j:file name="${basedir}/gump.xml" prettyPrint="true" xmlns="dummy">
 <module name="${gumpProject}">
@@ -70,9 +76,16 @@
     
     <!-- Standard Maven target to produce Javadocs, source -->
     <!-- and binary distributions.                         -->
-    <ant buildfile="build.xml" target="dist">
+<j:if test="${genAnt}">
+    <ant buildfile="build.xml" target="${maven.gump.ant.target}">
       <property name="final.name" value="${pom.artifactId}-@@DATE@@"/>
     </ant>
+</j:if>
+<j:if test="${genMaven}">
+    <maven goal="${maven.gump.maven.goals}">
+      <property name="final.name" value="${pom.artifactId}-@@DATE@@"/>
+    </maven>
+</j:if>
     
     <package>${pom.package}</package>
 
diff --git a/gump/plugin.properties b/gump/plugin.properties
index fb1237a4..ad35302e 100644
--- a/gump/plugin.properties
+++ b/gump/plugin.properties
@@ -14,3 +14,8 @@
 # limitations under the License.
 # -------------------------------------------------------------------
 
+maven.gump.ant.generate = false
+maven.gump.maven.generate = true
+
+maven.gump.ant.target = dist
+maven.gump.maven.goals = jar
diff --git a/gump/project.xml b/gump/project.xml
index a5f7298a..736ce02c 100644
--- a/gump/project.xml
+++ b/gump/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-gump-plugin</id>
   <name>Maven Gump Plug-in</name>
-  <currentVersion>1.3</currentVersion>
+  <currentVersion>1.4-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>produce Gump descriptor</shortDescription>
   <url>http://maven.apache.org/reference/plugins/gump/</url>
diff --git a/gump/xdocs/changes.xml b/gump/xdocs/changes.xml
index 58b75250..e1d83b50 100644
--- a/gump/xdocs/changes.xml
+++ b/gump/xdocs/changes.xml
@@ -24,6 +24,10 @@
     <author email="dion@multitask.com.au">dIon Gillard</author>
   </properties>
   <body>
+    <release version="1.4-SNAPSHOT" date="in CVS">
+      <action dev="brett" type="add" issue="MPGUMP-1">Allow creation of &lt;maven descriptor element, and default to it</action>
+      <action dev="brett" type="add">Add maven.gump.ant.target and maven.gump.maven.goal properties</action>
+    </release>
     <release version="1.3" date="2004-05-15"></release>
     <release version="1.2" date="2003-09-29">
       <action dev="dion" type="fix">gump.xml generated into basedir</action>
diff --git a/gump/xdocs/properties.xml b/gump/xdocs/properties.xml
index a348c8db..2aafaa23 100644
--- a/gump/xdocs/properties.xml
+++ b/gump/xdocs/properties.xml
@@ -33,6 +33,34 @@
       </p>
       <table>
         <tr><th>Property</th><th>Optional?</th><th>Description</th></tr>
+        <tr>
+          <td>maven.gump.ant.generate</td>
+          <td>Yes</td>
+          <td>
+            Set to true to generate an ant element. By default, none is added to the descriptor.
+          </td>
+        </tr>
+        <tr>
+          <td>maven.gump.maven.generate</td>
+          <td>Yes</td>
+          <td>
+            Set to false to not generate a maven element. By default, a maven element is added to the descriptor.
+          </td>
+        </tr>
+        <tr>
+          <td>maven.gump.ant.target</td>
+          <td>Yes</td>
+          <td>
+            The target to execute. Defaults to dist.
+          </td>
+        </tr>
+        <tr>
+          <td>maven.gump.maven.goals</td>
+          <td>Yes</td>
+          <td>
+            The goals to execute. Defaults to jar.
+          </td>
+        </tr>
         <tr>
           <td>pom.dependencies</td>
           <td>Yes</td>

Property	Optional?	Description
maven.gump.ant.generate	Yes	+ Set to true to generate an ant element. By default, none is added to the descriptor. +
maven.gump.maven.generate	Yes	+ Set to false to not generate a maven element. By default, a maven element is added to the descriptor. +
maven.gump.ant.target	Yes	+ The target to execute. Defaults to dist. +
maven.gump.maven.goals	Yes	+ The goals to execute. Defaults to jar. +
pom.dependencies	Yes