diff --git a/maven-archetype/maven-archetype-site/pom.xml b/maven-archetype/maven-archetype-site/pom.xml
new file mode 100644
index 0000000000..85c0961776
--- /dev/null
+++ b/maven-archetype/maven-archetype-site/pom.xml
@@ -0,0 +1,6 @@
+
+ 4.0.0
+ maven
+ maven-archetype-site
+ 1.0
+
diff --git a/maven-archetype/maven-archetype-site/src/site/apt/index.apt b/maven-archetype/maven-archetype-site/src/site/apt/index.apt
new file mode 100644
index 0000000000..07d6d8d5b1
--- /dev/null
+++ b/maven-archetype/maven-archetype-site/src/site/apt/index.apt
@@ -0,0 +1,10 @@
+ -----
+ Archetype
+ -----
+ Jason van Zyl
+ -----
+
+What is Archetype?
+
+ Archetype is a
+
diff --git a/maven-archetype/maven-archetype-site/src/site/site.xml b/maven-archetype/maven-archetype-site/src/site/site.xml
new file mode 100644
index 0000000000..a5a5d6f3ec
--- /dev/null
+++ b/maven-archetype/maven-archetype-site/src/site/site.xml
@@ -0,0 +1,24 @@
+
+
+
+ Doxia
+ http://doxia.codehaus.org
+
+
+ http://codehaus.org/codehaus-small.png
+ http://www.codehaus.org
+
+
+
+
+
+
+
+
+
+
diff --git a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
index 95fa326e02..b2749435b2 100644
--- a/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
+++ b/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
@@ -37,8 +37,6 @@ public class DefaultArtifact
private String type;
-
-
private String extension;
private String path;
diff --git a/mboot.jar b/mboot.jar
index ab50fd5fdf..5ab05d8cc6 100644
Binary files a/mboot.jar and b/mboot.jar differ