diff --git a/archetypes/simple-cli/.classpath b/archetypes/simple-cli/.classpath
index 1205a46dc..eb92216d7 100644
--- a/archetypes/simple-cli/.classpath
+++ b/archetypes/simple-cli/.classpath
@@ -2,9 +2,9 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="src" output="bin/test-classes" path="src/test/java"/>
+	<classpathentry kind="src" output="bin/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.devzuz.q.maven.jdt.core.mavenClasspathContainer"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/archetypes/simple-cli/.project b/archetypes/simple-cli/.project
index 75e326eb6..68f2ca6e3 100644
--- a/archetypes/simple-cli/.project
+++ b/archetypes/simple-cli/.project
@@ -14,6 +14,11 @@ $ mvn archetype:create -DgroupId=com.mycompany -DartifactId=batch \
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -31,9 +36,11 @@ $ mvn archetype:create -DgroupId=com.mycompany -DartifactId=batch \
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>com.springsource.platform.ide.facet.core.bundlenature</nature>
 		<nature>org.springframework.ide.eclipse.core.springnature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.devzuz.q.maven.jdt.core.mavenNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 	<linkedResources>
 		<link>
diff --git a/archetypes/simple-cli/.settings/org.eclipse.wst.common.project.facet.core.xml b/archetypes/simple-cli/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 000000000..af55bdf1a
--- /dev/null
+++ b/archetypes/simple-cli/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <runtime name="SpringSource AP v1.0"/>
+  <installed facet="com.springsource.platform.bundle" version="1.0"/>
+</faceted-project>
diff --git a/archetypes/simple-cli/pom.xml b/archetypes/simple-cli/pom.xml
index 04d73272b..5245c3ad2 100644
--- a/archetypes/simple-cli/pom.xml
+++ b/archetypes/simple-cli/pom.xml
@@ -6,7 +6,8 @@
 	<artifactId>simple-cli-archetype</artifactId>
 	<version>2.0.0.CI-SNAPSHOT</version>
 	<packaging>jar</packaging>
-	<name>Spring Batch Simple Commandline Archetype</name>
+	<name>Commandline</name>
+	<url>http://www.springframework.org/spring-batch/archetypes/simple-cli-archetype</url>
 
 	<description>
 		<![CDATA[
@@ -94,6 +95,32 @@
 					<target>1.5</target>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<manifestLocation>target/generated-resources/META-INF</manifestLocation>
+					<instructions>
+						<Bundle-SymbolicName>${bundle.symbolic.name}</Bundle-SymbolicName>
+						<Export-Package>!example,!test.*</Export-Package>
+						<Import-Package><![CDATA[
+ org.apache.commons.logging.*;version="[1.1.0, 2.0.0)",
+ org.springframework.batch.*;version="[2.0.0,3.0.0)",
+ org.springframework.*;version="[2.5.5, 3.0.0)"
+ 						]]></Import-Package>
+					</instructions>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
diff --git a/archetypes/simple-cli/src/main/resources/META-INF/MANIFEST.MF b/archetypes/simple-cli/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..0235ca886
--- /dev/null
+++ b/archetypes/simple-cli/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,28 @@
+Manifest-Version: 1.0
+Import-Library: org.springframework.spring;version="[2.5.4.A,3.0.0)"
+Import-Bundle: org.springframework.batch.core;version="[2.0.0,3.0.0)",
+ org.springframework.batch.infrastructure;version="[2.0.0,3.0.0)"
+Created-By: 1.5.0_09 (Sun Microsystems Inc.)
+Import-Package: org.apache.commons.logging;version="[1.1.0, 2.0.0)",or
+ g.springframework.batch.item.support;version="[2.0.0,3.0.0)"
+Bnd-LastModified: 1216037156921
+Export-Package: example;uses:="org.springframework.batch.item.support,
+ org.apache.commons.logging";version="2.0.0.CI",test.jdbc.da
+ tasource;uses:="org.apache.commons.logging,org.springframework.jdbc.c
+ ore,org.springframework.transaction,org.springframework.beans.factory
+ .config,org.springframework.jdbc.datasource,org.springframework.core.
+ io,org.springframework.util,org.springframework.beans.factory,org.spr
+ ingframework.transaction.support";version="2.0.0.CI"
+Bundle-Version: 2.0.0.CI-SNAPSHOT
+Ignore-Package: example,test.jdbc.datasource
+Bundle-Name: Spring Batch Simple Commandline Archetype
+Bundle-Description: This project is a minimal command line batch sampl
+ e from      Spring Batch.  Once installed you can use "mvn exec:java"
+  to       see the job run.
+Private-Package: example;version="1.1.0.DEV-SNAPSHOT",test.jdbc.dataso
+ urce;version="1.1.0.DEV-SNAPSHOT"
+Originally-Created-By: 1.5.0_09 (Sun Microsystems Inc.)
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.springframework.batch.sample.archetype.cli
+Tool: Bnd-0.0.255
+
diff --git a/archetypes/simple-cli/src/site/site.xml b/archetypes/simple-cli/src/site/site.xml
new file mode 100644
index 000000000..5fd09b5f2
--- /dev/null
+++ b/archetypes/simple-cli/src/site/site.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="Spring Batch: ${project.name}">
+
+	<bannerLeft>
+		<name>Spring Batch: ${project.name}</name>
+    	<href>index.html</href>
+	</bannerLeft>
+
+	<body>
+
+		<links>
+			<item name="${project.name}" href="index.html"/>
+		</links>
+		
+		<menu ref="reports"/>
+	
+	</body>
+
+</project>
diff --git a/archetypes/src/.project b/archetypes/src/.project
new file mode 100644
index 000000000..605dd3c5a
--- /dev/null
+++ b/archetypes/src/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>archetypes-src</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/archetypes/src/site/site.xml b/archetypes/src/site/site.xml
new file mode 100644
index 000000000..62ec37d46
--- /dev/null
+++ b/archetypes/src/site/site.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="Spring Batch: ${project.name}">
+
+	<bannerLeft>
+		<name>Spring Batch: ${project.name}</name>
+    	<href>index.html</href>
+	</bannerLeft>
+
+	<body>
+
+		<links>
+			<item name="${project.name}" href="index.html"/>
+		</links>
+		
+		<menu ref="modules"/>
+		<menu ref="reports"/>
+	
+	</body>
+
+</project>