diff --git a/aspectj/announcements/1.1.ann b/aspectj/announcements/1.1.ann
new file mode 100644
index 00000000..b1db1cd0
--- /dev/null
+++ b/aspectj/announcements/1.1.ann
@@ -0,0 +1,16 @@
+The Maven team is pleased to announce the AspectJ plugin 1.1 release!
+
+http://jakarta.apache.org/turbine/maven/reference/plugins/aspectj
+
+This plugin provides the basic facilities for weaving AspectJ aspects
+into source code.
+
+Changes in this version:
+
+o Added documentation for navigation, changes, properties and goals
+
+You can download the AspectJ Maven plugin here:
+http://www.ibiblio.org/maven/maven/jars/maven-aspectj-plugin-1.1.jar
+
+Have fun!
+-Vincent
\ No newline at end of file
diff --git a/aspectj/plugin.jelly.1.1.0 b/aspectj/plugin.jelly.1.1.0
deleted file mode 100644
index 303a94c3..00000000
--- a/aspectj/plugin.jelly.1.1.0
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0"?>
-
-<project xmlns:j="jelly:core"
-         xmlns:ant="jelly:ant"
-         xmlns:util="jelly:util">
-
-  <!--==================================================================-->
-  <!-- Compile all source code, weaving the Aspects                     -->
-  <!--==================================================================-->    
-  <goal name="aspectj"
-    description="Compile code with AspectJ"
-    prereqs="aspectj:compile"/>
-
-  <goal name="aspectj:compile"
-    description="Compile code with AspectJ">
-  
-    <j:if test="${sourcesPresent == 'true'}">
-
-      <ant:taskdef 
-        name="ajc" 
-        classname="org.aspectj.tools.ant.taskdefs.AjcTask"/>
-
-      <ant:available property="aspectSourcesPresent"
-        file="${pom.build.aspectSourceDirectory}"/>
-
-      <ant:uptodate property="aspectj.compile.notRequired" 
-        targetfile="${maven.build.dir}/${maven.final.name}.jar">
-        <ant:srcfiles dir="${pom.build.sourceDirectory}"/>
-        <j:if test="${aspectSourcesPresent == 'true'}">
-          <ant:srcfiles dir="${pom.build.aspectSourceDirectory}"/>
-        </j:if>
-      </ant:uptodate>
-
-      <j:set var="aspectjCompileNotRequired" value="${aspectj.compile.notRequired}"/>
-      <j:if test="${aspectjCompileNotRequired == null}">
-
-        <j:set 
-          var="ajcEmacssymFlag" 
-          value="${maven.aspectj.ajc.option.emacssym}"/>
-
-        <ant:ajc
-          destdir="${maven.build.dest}"
-          excludes="**/package.html"
-          debug="${maven.compile.debug}"
-          deprecation="${maven.compile.deprecation}"
-          optimize="${maven.compile.optimize}"
-          emacssym="${ajcEmacssymFlag}">
-
-          <ant:src>
-            <ant:path refid="maven.compile.src.set"/>
-              <j:if test="${aspectSourcesPresent == 'true'}">
-                <ant:pathelement location="${pom.build.aspectSourceDirectory}"/>
-              </j:if>
-          </ant:src>
-      
-          <j:forEach var="sm" items="${pom.build.sourceModifications}">
-            <ant:available property="classPresent" classname="${sm.className}"/>
-            <j:if test="${classPresent != 'true'}">
-              <j:forEach var="exclude" items="${sm.excludes}">
-                <ant:exclude name="${exclude}"/>
-              </j:forEach>
-            </j:if>
-          </j:forEach>
-      
-          <ant:classpath>
-            <ant:path refid="maven.dependency.classpath"/>
-            <ant:pathelement path="${maven.build.dest}"/>
-            <ant:pathelement path="${plugin.getDependencyPath('aspectj:aspectjrt')}"/>
-          </ant:classpath>
-        </ant:ajc>
-
-      </j:if>
-
-  </j:if>
-      
-  </goal>
-
-  <goal name="aspectj:ajdoc" description="Javadoc source using ajdoc">
-
-    <j:if test="${sourcesPresent == 'true'}">
-
-      <ant:taskdef name="ajdoc" classname="org.aspectj.tools.ant.taskdefs.Ajdoc" />
-
-      <ant:available property="aspectSourcesPresent"
-        file="${pom.build.aspectSourceDirectory}"/>
-        
-        <!-- retrieve various javadoc plugin vars -->
-        <util:tokenize var="javadocVarList" delim=",">
-          maven.javadoc.author,maven.javadoc.destdir,
-          maven.javadoc.links,maven.javadoc.maxmemory,
-          maven.javadoc.private,maven.javadoc.stylesheet,
-          maven.javadoc.use,maven.javadoc.version
-        </util:tokenize>
-    
-        <j:forEach var="javadocVar" items="${javadocVarList}">
-          <j:set var="javadocVar" value="${javadocVar.trim()}" />
-          <j:set var="${javadocVar}"
-            value="${pom.getPluginContext('maven-javadoc-plugin').getVariable(javadocVar)}"/>
-        </j:forEach>
-
-        <ant:ajdoc packagenames="${pom.package}.*"
-          destdir="${maven.javadoc.destdir}"
-          author="${maven.javadoc.author}"
-          private="${maven.javadoc.private}"
-          version="${maven.javadoc.version}"
-          use="${maven.javadoc.use}"
-          windowtitle="${title}"
-          doctitle="${title}"
-          bottom="${copyright}"
-          stylesheetfile="${maven.javadoc.stylesheet}">
-
-          <j:forEach var="link" items="${links}">
-            <ant:link href="${link.trim()}"/>
-          </j:forEach>
-          <ant:classpath>
-            <ant:path refid="maven.dependency.classpath"/>
-            <ant:path location="${maven.build.dest}"/>
-            <ant:pathelement path="${plugin.getDependencyPath('aspectj:aspectjrt')}"/>
-          </ant:classpath>
-
-          <ant:sourcepath>
-            <ant:path refid="maven.compile.src.set"/>
-            <j:if test="${aspectSourcesPresent == 'true'}">
-              <pathelement location="${pom.build.aspectSourceDirectory}"/>
-            </j:if>
-          </ant:sourcepath>            
-
-        </ant:ajdoc>
-
-    </j:if>
-
-  </goal>
-
-</project>
diff --git a/aspectj/project.xml b/aspectj/project.xml
index e097934d..bd67e1c1 100644
--- a/aspectj/project.xml
+++ b/aspectj/project.xml
@@ -14,6 +14,13 @@
     <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/aspectj/</connection>
     <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/aspectj/</url>
   </repository>
+  <versions>
+    <version>
+      <id>1.1</id>
+      <name>1.1</name>
+      <tag>MAVEN_ASPECTJ_1_1</tag>
+    </version>
+  </versions>
   <developers>
     <developer>
       <name>Vincent Massol</name>
@@ -23,6 +30,7 @@
       <roles>
         <role>Creator</role>
         <role>Java Developer</role>
+        <role>Release Manager</role>
       </roles>
     </developer>
     <developer>
@@ -47,25 +55,19 @@
   </developers>
   <dependencies>
     <dependency>
-      <id>aspectj:aspectjrt</id>
+      <groupId>aspectj</groupId>
+      <artifactId>aspectjrt</artifactId>
       <version>1.0.6</version>
-      <properties>
-        <classloader>root</classloader>
-      </properties>
     </dependency>
     <dependency>
-      <id>aspectj:aspectj-ant</id>
+      <groupId>aspectj</groupId>
+      <artifactId>aspectj-ant</artifactId>
       <version>1.0.6</version>
-      <properties>
-        <classloader>root</classloader>
-      </properties>
     </dependency>
     <dependency>
-      <id>aspectj:aspectj-tools</id>
+      <groupId>aspectj</groupId>
+      <artifactId>aspectj-tools</artifactId>
       <version>1.0.6</version>
-      <properties>
-        <classloader>root</classloader>
-      </properties>
     </dependency>
   </dependencies>
 </project>
diff --git a/aspectj/project.xml.1.1.0 b/aspectj/project.xml.1.1.0
deleted file mode 100644
index 1af8a540..00000000
--- a/aspectj/project.xml.1.1.0
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project>
-  <extend>${basedir}/../project.xml</extend>
-  <pomVersion>3</pomVersion>
-  <id>maven-aspectj-plugin</id>
-  <name>Maven AspectJ Plug-in</name>
-  <currentVersion>1.1</currentVersion>
-  <description/>
-  <shortDescription>Eclipse Plugin for AspectJ</shortDescription>
-  <url>http://maven.apache.org/reference/plugins/aspectj/</url>
-  <siteDirectory>/www/maven.apache.org/reference/plugins/aspectj/</siteDirectory>
-  <repository>
-    <connection>scm:cvs:pserver:anoncvs@cvs.apache.org:/home/cvspublic:maven/src/plugins-build/aspectj/</connection>
-    <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/aspectj/</url>
-  </repository>
-  <developers>
-    <developer>
-      <name>dIon Gillard</name>
-      <id>dion</id>
-      <email>dion@multitask.com.au</email>
-      <organization>Multitask Consulting</organization>
-      <roles>
-        <role>Documentation</role>
-      </roles>
-    </developer>
-    <developer>
-      <name>Vincent Massol</name>
-      <id>vmassol</id>
-      <email>vmassol@octo.com</email>
-      <organization>Octo Technology</organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <name>Pete Kazmier</name>
-      <id>kaz</id>
-      <email>pete-apache-dev@kazmier.com</email>
-      <organization></organization>
-      <roles>
-        <role>Java Developer</role>
-        <role>Documentation</role>
-      </roles>
-    </developer>
-  </developers>
-  <dependencies>
-    <dependency>
-      <groupId>aspectj</groupId>
-      <artifactId>aspectjrt</artifactId>
-      <version>1.1.0</version>
-      <properties>
-        <classloader>root</classloader>
-      </properties>
-    </dependency>
-    <dependency>
-      <groupId>aspectj</groupId>
-      <artifactId>aspectjtools</artifactId>
-      <version>1.1.0</version>
-      <properties>
-        <classloader>root</classloader>
-      </properties>
-    </dependency>
-  </dependencies>
-  <build>
-    <resources>
-      <resource>
-        <directory>${basedir}</directory>
-        <excludes>
-          <exclude>target/**</exclude>
-          <exclude>src/**</exclude>
-          <exclude>xdocs/**</exclude>
-          <exclude>maven.xml</exclude>
-          <exclude>maven.log</exclude>
-          <exclude>velocity.log</exclude>
-          <exclude>.cvsignore</exclude>
-        </excludes>
-      </resource>
-    </resources>
-  </build>
-</project>
diff --git a/aspectj/xdocs/changes.xml b/aspectj/xdocs/changes.xml
index 8664acb6..cc10a0b6 100644
--- a/aspectj/xdocs/changes.xml
+++ b/aspectj/xdocs/changes.xml
@@ -6,7 +6,7 @@
   </properties>
 
   <body>
-    <release version="1.1" date="in CVS">
+    <release version="1.1" date="2003-09-21">
       <action dev="dion" type="add">
         Added documentation for navigation, changes, properties and goals
       </action>
diff --git a/aspectj/xdocs/navigation.xml b/aspectj/xdocs/navigation.xml
index 756f7bc6..5d578b4e 100644
--- a/aspectj/xdocs/navigation.xml
+++ b/aspectj/xdocs/navigation.xml
@@ -12,5 +12,8 @@
       <item name="Goals"      href="/goals.html" />
       <item name="Properties" href="/properties.html" />
     </menu>
+    <menu name="Downloads">
+      <item name="AspectJ Plugin 1.1" href="http://www.ibiblio.org/maven/maven/plugins/maven-aspectj-plugin-1.2.jar"/>
+    </menu>
   </body>
 </project>