diff --git a/repository/plugin.jelly b/repository/plugin.jelly
index 7b7c1bca..9996b54a 100644
--- a/repository/plugin.jelly
+++ b/repository/plugin.jelly
@@ -157,7 +157,26 @@
     
     <!-- 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">
+      <u:tokenize var="sources_dirs" delim="${path.separator}">${context.getAntProject().getReferences().get('maven.compile.src.set')}</u: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"/>
diff --git a/repository/xdocs/changes.xml b/repository/xdocs/changes.xml
index 1831380d..a3b3d9e9 100644
--- a/repository/xdocs/changes.xml
+++ b/repository/xdocs/changes.xml
@@ -32,6 +32,7 @@
         </ul>
       </action>
       <action dev="dion" type="fix" issue="MPREPO-6">Fixed typo in docs</action>
+      <action dev="fgiust" type="add">create-upload-bundle now also adds a jar with java sources</action>
     </release>
     <release version="1.2" date="2004-05-15">
       <action dev="brett" issue="MPREPO-5" type="update">Deprecate maven.repository.group, use maven.remote.group instead</action>