diff --git a/maven-model/maven.xml b/maven-model/maven.xml
index ae7bcc105f..74daddc62d 100644
--- a/maven-model/maven.xml
+++ b/maven-model/maven.xml
@@ -1,20 +1,22 @@
 <project xmlns:modello="modello" xmlns:ant="jelly:ant" xmlns:maven="jelly:maven" xmlns:j="jelly:core">
+
   <preGoal name="java:compile">
-    <ant:path id="modello.sources" location="target/generated-sources" />
-    <maven:addPath id="maven.compile.src.set" refid="modello.sources" />
-    <j:set var="sourcesPresent" value="true" />
-
-    <modello:generate model="maven.mdo" type="java" packageWithVersion="false" version="3.0.0" targetDirectory="target/generated-sources" />
-    <modello:generate model="maven.mdo" type="dom4j-reader" packageWithVersion="false" version="3.0.0" targetDirectory="target/generated-sources" />
-    <modello:generate model="maven.mdo" type="dom4j-writer" packageWithVersion="false" version="3.0.0" targetDirectory="target/generated-sources" />
-
+    <attainGoal name="modello:modello"/>
     <!-- Need the original package as well -->
-    <ant:copy tofile="target/maven.mdo.m1" file="maven.mdo" />
-    <ant:replace file="target/maven.mdo.m1" token="org.apache.maven.model" value="org.apache.maven.project" />
-
-    <modello:generate model="target/maven.mdo.m1" type="java" packageWithVersion="false" version="3.0.0" targetDirectory="target/generated-sources" />
-    <modello:generate model="target/maven.mdo.m1" type="dom4j-reader" packageWithVersion="false" version="3.0.0" targetDirectory="target/generated-sources" />
-    <modello:generate model="target/maven.mdo.m1" type="dom4j-writer" packageWithVersion="false" version="3.0.0" targetDirectory="target/generated-sources" />
+    <ant:copy tofile="${basedir}/target/maven.mdo.m1" file="${maven.modello.model}" />
+    <ant:replace file="${basedir}/target/maven.mdo.m1" token="org.apache.maven.model" value="org.apache.maven.project" />
+    <maven:set plugin="maven-modello-plugin" property="maven.modello.model" value="${basedir}/target/maven.mdo.m1"/>
+    <attainGoal name="modello:modello"/>
   </preGoal>
-</project>
 
+  <!-- We need to have the generated code before to compute the javadoc -->
+  <preGoal name="maven-javadoc-plugin:register">
+    <attainGoal name="modello:modello"/>
+    <!-- Need the original package as well -->
+    <ant:copy tofile="${basedir}/target/maven.mdo.m1" file="${maven.modello.model}" />
+    <ant:replace file="${basedir}/target/maven.mdo.m1" token="org.apache.maven.model" value="org.apache.maven.project" />
+    <maven:set plugin="maven-modello-plugin" property="maven.modello.model" value="${basedir}/target/maven.mdo.m1"/>
+    <attainGoal name="modello:modello"/>
+  </preGoal>
+
+</project>
\ No newline at end of file
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index 8953c7f7d9..72466fb778 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -47,6 +47,21 @@
       </plugin>
     </plugins>
   </build>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <configuration>
+          <!-- Exclude the navigation file for Maven 1 sites
+               as it interferes with the site generation. -->
+          <moduleExcludes>
+            <xdoc>navigation.xml</xdoc>
+          </moduleExcludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
   <profiles>
     <profile>
       <id>all-models</id>
diff --git a/maven-model/project.properties b/maven-model/project.properties
index 16e8db7d0f..33f63bd9d5 100644
--- a/maven-model/project.properties
+++ b/maven-model/project.properties
@@ -3,7 +3,7 @@
 #=====
 
 # TODO: remove http://people.apache.org/repo/m1-snapshot-repository/, just there for SNAPSHOTs
-maven.repo.remote = http://www.ibiblio.org/maven,http://people.apache.org/repo/m1-snapshot-repository/
+maven.repo.remote = http://repo1.maven.org/maven,http://people.apache.org/repo/m1-snapshot-repository/
 
 # Repository to deploy to
 maven.repo.list=apache.snapshots
@@ -24,5 +24,29 @@ maven.repo.apache.snapshots.privatekey=${maven.repo.apache.releases.privatekey}
 maven.repo.apache.snapshots.passphrase=${maven.repo.apache.releases.passphrase}
 maven.repo.apache.snapshots.group=${maven.repo.apache.releases.group}
 
+# Compilation settings
 maven.compile.source=1.4
-maven.compile.target=1.4
\ No newline at end of file
+maven.compile.target=1.4
+
+# Modello settings
+maven.modello.model=${basedir}/maven.mdo
+maven.modello.packageWithVersion=false
+maven.modello.version=3.0.0
+maven.modello.plugins=xpp3,stax,dom4j
+
+# LinkCheck plugin settings
+maven.linkcheck.exclude=${pom.repository.url},${maven.changelog.svn.baseurl}
+
+# Site plugin settings
+maven.site.stage.address=people.apache.org
+maven.site.deploy.method=rsync
+maven.site.stage.directory=/home/${maven.username}/public_html/maven-model/${pom.currentVersion}
+
+# XDOC plugin settings
+# Display the date on the Maven web site
+maven.xdoc.date = bottom
+maven.xdoc.date.format = dd MMMM yyyy HH:mm z
+# Use the maven site theme
+maven.xdoc.theme.url=http://maven.apache.org/maven-1.x/style/maven-stylus.css
+maven.xdoc.locale.default=en
+maven.docs.src=${basedir}/src/site/xdoc
\ No newline at end of file
diff --git a/maven-model/project.xml b/maven-model/project.xml
index 9147b693a3..6ee3a3a168 100644
--- a/maven-model/project.xml
+++ b/maven-model/project.xml
@@ -1,32 +1,222 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+/*
+ * Copyright 2005-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+<project xmlns="http://maven.apache.org/POM/3.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/3.0.0 http://maven.apache.org/maven-v3_0_0.xsd">
 
-<project>
   <name>Maven Model</name>
   <groupId>maven</groupId>
   <artifactId>maven-model</artifactId>
   <currentVersion>3.0.2-SNAPSHOT</currentVersion>
-  <description>Maven Model</description>
-  <shortDescription>Maven Model</shortDescription>
+  <description>The Maven project descriptor used in Maven 1.x. This library is used to represent in Java the POM (project.xml) and it offers services to parse and to serialize it.</description>
+  <shortDescription>The Maven project descriptor used in Maven.</shortDescription>
+  
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+    <logo>http://maven.apache.org/images/apache-maven-project-2.png</logo>
+  </organization>
+
+  <inceptionYear>2005</inceptionYear>
+  <package>org.apache.maven</package>
+  <logo>http://maven.apache.org/images/maven-logo-2.gif</logo>
+  <url>http://maven.apache.org/maven-1.x/reference/maven-model/${pom.currentVersion}/</url>
+
+  <siteAddress>people.apache.org</siteAddress>
+  <siteDirectory>/www/maven.apache.org/maven-1.x/reference/maven-model/${pom.currentVersion}/</siteDirectory>
+  <distributionSite>people.apache.org</distributionSite>
+  <distributionDirectory>/www/people.apache.org/repo/m1-ibiblio-rsync-repository/</distributionDirectory>
+
+  <repository>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/components/trunk/maven-model/</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/components/trunk/maven-model/</developerConnection>
+    <url>http://svn.apache.org/viewcvs/maven/components/trunk/maven-model/</url>
+  </repository>
+
+  <mailingLists>
+    <mailingList>
+      <name>Maven User List</name>
+      <subscribe>users-subscribe@maven.apache.org</subscribe>
+      <unsubscribe>users-unsubscribe@maven.apache.org</unsubscribe>
+      <post>users@maven.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/maven-users/</archive>
+      <otherArchives>
+        <otherArchive>http://www.mail-archive.com/users@maven.apache.org/</otherArchive>
+        <otherArchive>http://www.nabble.com/Maven---Users-f178.html</otherArchive>
+      </otherArchives>
+    </mailingList>
+    <mailingList>
+      <name>Maven Developer List</name>
+      <subscribe>dev-subscribe@maven.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@maven.apache.org</unsubscribe>
+      <post>dev@maven.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/maven-dev/</archive>
+      <otherArchives>
+        <otherArchive>http://www.mail-archive.com/dev@maven.apache.org/</otherArchive>
+        <otherArchive>http://www.nabble.com/Maven-Developers-f179.html</otherArchive>
+      </otherArchives>
+    </mailingList>
+    <mailingList>
+      <name>Maven Commits List</name>
+      <subscribe>commits-subscribe@maven.apache.org</subscribe>
+      <unsubscribe>commits-unsubscribe@maven.apache.org</unsubscribe>
+      <post>commits@maven.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/maven-dev/</archive>
+    </mailingList>
+    <mailingList>
+      <name>Maven Issues List</name>
+      <subscribe>issues-subscribe@maven.apache.org</subscribe>
+      <unsubscribe>issues-unsubscribe@maven.apache.org</unsubscribe>
+      <post>issues@maven.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/maven-issues/</archive>
+    </mailingList>
+    <mailingList>
+      <name>Maven Announce List</name>
+      <subscribe>announce-subscribe@maven.apache.org</subscribe>
+      <unsubscribe>announce-unsubscribe@maven.apache.org</unsubscribe>
+      <post>announce@maven.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/maven-announce/</archive>
+    </mailingList>
+    <mailingList>
+      <name>Apache Announce List</name>
+      <subscribe>announce-subscribe@apache.org</subscribe>
+      <unsubscribe>announce-unsubscribe@apache.org</unsubscribe>
+      <post>announce@apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/www-announce/</archive>
+    </mailingList>
+  </mailingLists>
+  
+  <developers>
+    <developer>
+      <name>Arnaud Heritier</name>
+      <id>aheritier</id>
+      <email>aheritier@apache.org</email>
+      <organization>Octo Technology</organization>
+      <roles>
+        <role>Developer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <name>Vincent Massol</name>
+      <id>vmassol</id>
+      <email>vmassol@pivolis.com</email>
+      <organization>Pivolis</organization>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+    <developer>
+      <name>Brett Porter</name>
+      <id>brett</id>
+      <email>brett@apache.org</email>
+      <organization>f2 network</organization>
+      <roles>
+        <role>Developer</role>
+      </roles>
+      <timezone>+10</timezone>
+    </developer>
+    <developer>
+      <name>Jason van Zyl</name>
+      <id>jvanzyl</id>
+      <email>jason@zenplex.com</email>
+      <organization>Zenplex</organization>
+      <roles>
+        <role>Architect</role>
+        <role>Release Manager</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Emmanuel Venisse</name>
+      <id>evenisse</id>
+      <email>emmanuel@venisse.net</email>
+      <organization/>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+      <timezone>+1</timezone>
+    </developer>
+  </developers>
+
   <dependencies>
+  
     <dependency>
       <groupId>maven</groupId>
       <artifactId>maven-modello-plugin</artifactId>
-      <version>1.0-alpha-3-SNAPSHOT</version>
+      <version>1.0-SNAPSHOT</version>
       <type>plugin</type>
     </dependency>
+
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-utils</artifactId>
       <version>1.0.3</version>
     </dependency>
+    
     <dependency>
       <groupId>maven</groupId>
       <artifactId>dom4j</artifactId>
       <version>1.7-20060614</version>
       <url>http://www.dom4j.org/</url>
+      <properties>
+        <comment>Maven model dependency - Required to read/write XML using dom4j.</comment>
+      </properties>
     </dependency>
+
+    <dependency>
+      <groupId>stax</groupId>
+      <artifactId>stax</artifactId>
+      <version>1.2.0</version>
+      <properties>
+        <comment>Maven model dependency - Required to read/write XML using stax.</comment>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>stax</groupId>
+      <artifactId>stax-api</artifactId>
+      <version>1.0.1</version>
+      <properties>
+        <comment>Maven model dependency - Required to read/write XML using stax.</comment>
+      </properties>
+    </dependency>
+    <dependency>
+      <groupId>net.java.dev.stax-utils</groupId>
+      <artifactId>stax-utils</artifactId>
+      <version>20060502</version>
+      <properties>
+        <comment>Maven model dependency - Required to read/write XML using stax.</comment>
+      </properties>
+    </dependency>
+
   </dependencies>
+  
   <build>
     <defaultGoal>jar</defaultGoal>
+    <sourceDirectory>${maven.build.dir}/generated-src/main/modello</sourceDirectory>
   </build>
+  
+  <reports>
+    <report>maven-modello-plugin</report>
+    <report>maven-javadoc-plugin</report>
+    <report>maven-changelog-plugin</report>
+    <report>maven-file-activity-plugin</report>
+    <report>maven-developer-activity-plugin</report>
+    <report>maven-linkcheck-plugin</report>
+  </reports>
+
 </project>
diff --git a/maven-model/src/site/xdoc/navigation.xml b/maven-model/src/site/xdoc/navigation.xml
new file mode 100644
index 0000000000..d4f039d805
--- /dev/null
+++ b/maven-model/src/site/xdoc/navigation.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- 
+ /*
+  * Copyright 2001-2007 The Apache Software Foundation.
+  * 
+  * Licensed under the Apache License, Version 2.0 (the "License");
+  * you may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at
+  * 
+  *      http://www.apache.org/licenses/LICENSE-2.0
+  * 
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+-->
+<project name="Project Descriptor">
+  <title>Project Descriptor</title>
+  <body>
+    <breadcrumbs>
+      <item name="Apache" href="http://www.apache.org" />
+      <item name="Maven" href="http://maven.apache.org/" />
+      <item name="Maven 1.x" href="http://maven.apache.org/maven-1.x/" />
+      <item name="Reference" href="http://maven.apache.org/maven-1.x/reference/index.html" />
+    </breadcrumbs>
+    <menu name="Maven Project Descriptor">
+      <item name="About" href="/index.html" />
+      <item name="Model Documentation" href="/maven.html" />
+      <item name="API Docs" href="/apidocs/" target="_blank" />
+    </menu>
+  </body>
+</project>
\ No newline at end of file