diff --git a/artifact/project.xml b/artifact/project.xml
index 4eebb471..7cd5d776 100644
--- a/artifact/project.xml
+++ b/artifact/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-artifact-plugin</id>
   <name>Maven Artifact Plugin</name>
-  <currentVersion>1.2</currentVersion>
+  <currentVersion>1.3-SNAPSHOT</currentVersion>
   <description/>
   <shortDescription>Tools to manage artifacts and deployment</shortDescription>
   <url>http://maven.apache.org/reference/plugins/artifact/</url>
diff --git a/artifact/src/plugin-resources/templates/manifest.vm b/artifact/src/plugin-resources/templates/manifest.vm
index 8925765f..464675d3 100644
--- a/artifact/src/plugin-resources/templates/manifest.vm
+++ b/artifact/src/plugin-resources/templates/manifest.vm
@@ -1,5 +1,5 @@
 Built-By: ${jellyContext.getVarable("user.name")}
-Created-By: Apache Jakarta Maven
+Created-By: Apache Maven
 #if (${pom.Package})
 Package: ${pom.Package}
 #end
diff --git a/artifact/xdocs/changes.xml b/artifact/xdocs/changes.xml
index 08cc598f..5f1b7264 100644
--- a/artifact/xdocs/changes.xml
+++ b/artifact/xdocs/changes.xml
@@ -25,6 +25,9 @@
     <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
   <body>
+    <release version="1.3" date="In CVS">
+      <action dev="evenisse" type="fix" due-to="Martin van den Bemt" issue="MPJAR-29">Replace Apache Jakarta Maven by Apache Maven in Manifest</action>
+    </release>
     <release version="1.2" date="2004-05-15">
       <action dev="evenisse" type="add">Add documentation for the compress mode property.</action>
       <action dev="evenisse" type="fix">Fix Scp deployer when it use compress mode.</action>
diff --git a/ejb/plugin.jelly b/ejb/plugin.jelly
index 35cfcd3e..bb3a0aab 100644
--- a/ejb/plugin.jelly
+++ b/ejb/plugin.jelly
@@ -106,7 +106,7 @@
 
       <ant:manifest>
         <ant:attribute name="Built-By" value="${user.name}"/>
-        <ant:attribute name="Created-By" value="Apache Jakarta Maven"/>
+        <ant:attribute name="Created-By" value="Apache Maven"/>
         <ant:attribute name="Package" value="${pom.package}"/>
         <j:set var="classPath" value="${maven.ejb.classpath}"/>
         <j:if test="${!empty(classPath)}">
diff --git a/ejb/xdocs/changes.xml b/ejb/xdocs/changes.xml
index b632c5de..892c87cd 100644
--- a/ejb/xdocs/changes.xml
+++ b/ejb/xdocs/changes.xml
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.5" date="In CVS">
+      <action dev="evenisse" type="fix" due-to="Martin van den Bemt" issue="MPJAR-29">Replace Apache Jakarta Maven by Apache Maven in Manifest</action>
       <action dev="evenisse" type="add">Add ejb:install-client and ejb:deploy-client goals.</action>
     </release>
     <release version="1.4" date="2004-05-15">
diff --git a/jar/plugin.jelly b/jar/plugin.jelly
index 5074a917..00034b38 100644
--- a/jar/plugin.jelly
+++ b/jar/plugin.jelly
@@ -76,7 +76,7 @@
       </ant:metainf>
       <ant:manifest>
         <ant:attribute name="Built-By" value="${user.name}"/>
-        <ant:attribute name="Created-By" value="Apache Jakarta Maven"/>
+        <ant:attribute name="Created-By" value="Apache Maven"/>
         <ant:attribute name="Package" value="${pom.package}"/>
         <ant:attribute name="Build-Jdk" value="${java.version}"/>
 
diff --git a/jar/project.xml b/jar/project.xml
index 6fee0f8d..06a22ca9 100644
--- a/jar/project.xml
+++ b/jar/project.xml
@@ -23,7 +23,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jar-plugin</id>
   <name>Maven Jar Plug-in</name>
-  <currentVersion>1.5</currentVersion>
+  <currentVersion>1.6-SNAPSHOT</currentVersion>
   <description>Plugin for creating JAR files. Requires Maven 1.0 RC2.</description>
   <shortDescription>Create jar files</shortDescription>
   <url>http://maven.apache.org/reference/plugins/jar/</url>
diff --git a/jar/xdocs/changes.xml b/jar/xdocs/changes.xml
index c2acdb97..006e7d87 100644
--- a/jar/xdocs/changes.xml
+++ b/jar/xdocs/changes.xml
@@ -25,6 +25,9 @@
     <author email="dion@apache.org">dIon Gillard</author>
   </properties>
   <body>
+    <release version="1.6" date="In CVS">
+      <action dev="evenisse" type="fix" due-to="Martin van den Bemt" issue="MPJAR-29">Replace Apache Jakarta Maven by Apache Maven in Manifest</action>
+    </release>
     <release version="1.5" date="2004-05-13">
       <action dev="brett" type="fix" issue="MPJAR-27">trim shortDescription and limit to 72 characters with warning when using specification-title to avoid broken manifests</action>
       <action dev="brett" type="fix" issue="MPJAR-24">change ln -sf command to rm -f symlink, ln -s combo because -f flag is not used on Solaris ln.</action>
diff --git a/jnlp/xdocs/changes.xml b/jnlp/xdocs/changes.xml
index 7a44da79..da0fa622 100644
--- a/jnlp/xdocs/changes.xml
+++ b/jnlp/xdocs/changes.xml
@@ -29,8 +29,8 @@
       <action dev="evenisse" type="fix" issue="MPJNLP-9">Initialize correctly jnlp:generate-keystore goal.</action>
       <action dev="evenisse" type="add" due-to="Pelle Braendgaard" issue="MPJNLP-8">Added Support for JarDiff.</action>
       <action dev="evenisse" type="add">Added maven.jnlp.signjar.storetype property.</action>
-      <action dev="mvdb" type="fix">Documented the maven.jnlp.properties and made it work correctly</action>
-      <action dev="mvdb" type="fix">Created By is now set to Apache Maven instead of Apache Jakarta Maven</action>
+      <action dev="evenisse" due-to="Martin van den Bemt" type="fix" issue="MPJNLP-12">Documented the maven.jnlp.properties and made it work correctly</action>
+      <action dev="evenisse" due-to="Martin van den Bemt" type="fix">Created By is now set to Apache Maven instead of Apache Jakarta Maven</action>
     </release>
     <release version="1.3" date="2004-03-10">
       <action dev="evenisse" type="add" issue="MPJNLP-7">Added extra property maven.jnlp.cert.version to support certificate renewals.</action>