diff --git a/archetypes/simple-cli/pom.xml b/archetypes/simple-cli/pom.xml
index fe3997a01..e17caf22d 100644
--- a/archetypes/simple-cli/pom.xml
+++ b/archetypes/simple-cli/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.batch</groupId>
 	<artifactId>org.springframework.batch.archetype.simple.cli</artifactId>
@@ -10,7 +11,9 @@
 		<![CDATA[
       This project is a minimal command line batch sample from
       Spring Batch.  Once installed you can use "mvn exec:java" to 
-      see the job run.
+      see the job run; or if you ship the lib directory you can put
+      the project jar on the classpath and run the
+      CommandLineJobRunner directly or with "java -jar".
     ]]>
 	</description>
 	<properties>
@@ -50,29 +53,6 @@
 				</snapshotRepository>
 			</distributionManagement>
 		</profile>
-		<profile>
-			<id>manifest</id>
-			<activation>
-				<activeByDefault>false</activeByDefault>
-			</activation>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.springsource.bundlor</groupId>
-						<artifactId>com.springsource.bundlor.maven</artifactId>
-						<executions>
-							<execution>
-								<id>bundlor-manifest</id>
-								<phase>package</phase>
-								<goals>
-									<goal>manifest</goal>
-								</goals>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
 	</profiles>
 
 	<dependencies>
@@ -139,9 +119,6 @@
 					<groupId>com.springsource.bundlor</groupId>
 					<artifactId>com.springsource.bundlor.maven</artifactId>
 					<version>1.0.0.M1B</version>
-					<configuration>
-						<outputFile>${project.basedir}/src/main/resources/META-INF/MANIFEST.MF</outputFile>
-					</configuration>
 				</plugin>
 				<plugin>
 					<artifactId>maven-assembly-plugin</artifactId>
@@ -205,6 +182,36 @@
 					</arguments>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/lib</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<index>true</index>
+						<manifest>
+							<mainClass>org.springframework.batch.core.launch.support.CommandLineJobRunner</mainClass>
+							<addClasspath>true</addClasspath>
+							<classpathPrefix>lib/</classpathPrefix>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 
diff --git a/archetypes/simple-cli/src/main/resources/META-INF/MANIFEST.MF b/archetypes/simple-cli/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index bdd712f9e..000000000
Binary files a/archetypes/simple-cli/src/main/resources/META-INF/MANIFEST.MF and /dev/null differ
diff --git a/archetypes/simple-cli/src/main/resources/META-INF/spring/module-context.xml b/archetypes/simple-cli/src/main/resources/META-INF/spring/module-context.xml
index 43a531208..2789ae0d2 100644
--- a/archetypes/simple-cli/src/main/resources/META-INF/spring/module-context.xml
+++ b/archetypes/simple-cli/src/main/resources/META-INF/spring/module-context.xml
@@ -1,36 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans 
-       	http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:batch="http://www.springframework.org/schema/batch"
+	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.0.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<description>Example job to get you started. It provides a skeleton for a typical batch application.</description>
-	
-	<bean id="job1" parent="simpleJob">
-		<property name="steps">
-			<list>
-				<bean id="step1" parent="simpleStep">
-					<property name="itemReader">
-						<bean class="example.ExampleItemReader" />
-					</property>
-					<property name="itemWriter">
-						<bean class="example.ExampleItemWriter" />
-					</property>
-				</bean>
-			</list>
-		</property>
-	</bean>
+	<description>Example job to get you started. It provides a
+		skeleton for a typical batch application.</description>
 
-	<bean id="simpleJob" class="org.springframework.batch.core.job.SimpleJob" abstract="true">
-		<property name="jobRepository" ref="jobRepository" />
-		<property name="restartable" value="true" />
-	</bean>
+	<batch:job id="job1">
+		<batch:step id="step1" parent="simpleStep">
+			<batch:tasklet>
+				<batch:chunk reader="reader" writer="writer"/>
+			</batch:tasklet>
+		</batch:step>
+	</batch:job>
 
-	<bean id="simpleStep" class="org.springframework.batch.core.step.item.SimpleStepFactoryBean"
+	<bean id="reader" class="example.ExampleItemReader" />
+	<bean id="writer" class="example.ExampleItemWriter" />
+
+	<bean id="simpleStep"
+		class="org.springframework.batch.core.step.item.SimpleStepFactoryBean"
 		abstract="true">
 		<property name="transactionManager" ref="transactionManager" />
 		<property name="jobRepository" ref="jobRepository" />
 		<property name="startLimit" value="100" />
 		<property name="commitInterval" value="1" />
 	</bean>
-	
+
 </beans>