diff --git a/artifact/plugin.jelly b/artifact/plugin.jelly
index f469c251..bd91e382 100644
--- a/artifact/plugin.jelly
+++ b/artifact/plugin.jelly
@@ -182,6 +182,49 @@
     </ant:echo>
   </goal>
 
+  <goal name="artifact:create-upload-bundle">
+    <!-- Create the artifact in question. -->
+    <attainGoal name="jar:jar"/>
+
+    <!-- Delete/create the bundle holding tank -->
+    <ant:delete dir="${maven.build.dir}/bundle"/>
+    <ant:mkdir dir="${maven.build.dir}/bundle"/>
+
+    <!-- Copy in the artifact -->
+    <ant:copy file="${maven.build.dir}/${maven.final.name}.jar" todir="${maven.build.dir}/bundle"/>
+
+    <!-- Copy in the POM -->
+    <ant:copy file="${basedir}/project.xml" todir="${maven.build.dir}/bundle"/>
+
+    <!-- Copy in the license, if there is no license this will fail. -->
+    <ant:copy file="${basedir}/LICENSE.txt" todir="${maven.build.dir}/bundle"/>
+
+    <!-- Add sources -->
+    <ant:jar jarfile="${maven.build.dir}/bundle/${maven.final.name}-sources.jar">
+      <util:tokenize var="sources_dirs" delim="${path.separator}">${context.getAntProject().getReferences().get('maven.compile.src.set')}</util:tokenize>
+      <j:forEach var="dir" items="${sources_dirs}">
+         <ant:fileset dir="${dir}" />
+      </j:forEach>
+      <ant:manifest>
+        <ant:attribute name="Built-By" value="${user.name}"/>
+        <ant:attribute name="Created-By" value="Apache Maven"/>
+        <ant:attribute name="Package" value="${pom.package}"/>
+        <ant:attribute name="Build-Jdk" value="${java.version}"/>
+        <ant:attribute name="Extension-Name" value="${pom.artifactId}"/>
+        <ant:attribute name="Specification-Vendor" value="${pom.organization.name}"/>
+        <ant:attribute name="Implementation-Title" value="${pom.package}"/>
+        <ant:attribute name="Implementation-Vendor" value="${pom.organization.name}"/>
+        <ant:attribute name="Implementation-Version" value="${pom.currentVersion}"/>
+      </ant:manifest>
+    </ant:jar>
+
+    <ant:jar 
+      jarfile="${maven.build.dir}/${maven.final.name}-bundle.jar"
+      basedir="${maven.build.dir}/bundle"/>
+
+  </goal>
+
+
   <!-- ================================================================== -->
   <!-- D E P L O Y  A R T I F A C T  T A G                                -->
   <!-- ================================================================== -->
diff --git a/artifact/xdocs/changes.xml b/artifact/xdocs/changes.xml
index 433f6305..f2fadc99 100644
--- a/artifact/xdocs/changes.xml
+++ b/artifact/xdocs/changes.xml
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.8-SNAPSHOT" date="In SVN">
+      <action dev="ltheussl" type="add" issue="MPARTIFACT-64">New goal <code>artifact:create-upload-bundle</code> that replaces deprecated <code>create-upload-bundle</code>.</action>
       <action dev="aheritier" type="update" issue="MAVEN-1739">Upgrade to HttpClient 3.0.</action>
     </release>
     <release version="1.7" date="2005-12-12">
diff --git a/artifact/xdocs/goals.xml b/artifact/xdocs/goals.xml
new file mode 100644
index 00000000..1ecbd0fa
--- /dev/null
+++ b/artifact/xdocs/goals.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+  <properties>
+    <title>Maven Artifact Plugin Goals</title>
+  </properties>
+  <body>
+    <goals>
+      <goal>
+        <name>artifact:create-upload-bundle</name>
+        <description>
+          Create a bundle that can be uploaded to ibiblio.
+          (Replaces the deprecated <code>create-upload-bundle</code> used in Maven 1.0).
+        </description>
+      </goal>
+    </goals>
+  </body>
+</document>
\ No newline at end of file
