diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 2aaa38dff..0f18ba66d 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -2,9 +2,7 @@
 	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>spring-batch-archetypes</artifactId>
-	<version>1.1.0.DEV-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Archetypes</name>
 	<description>
@@ -18,6 +16,13 @@
 ]]>
 	</description>
 
+	<parent>
+		<groupId>org.springframework.batch</groupId>
+		<artifactId>spring-batch</artifactId>
+		<version>1.1.0.DEV-SNAPSHOT</version>
+		<relativePath>..</relativePath>
+	</parent>
+
 	<modules>
 		<module>simple-cli</module>
 	</modules>
diff --git a/archetypes/simple-cli/pom.xml b/archetypes/simple-cli/pom.xml
index d438c32e8..d3170eb59 100644
--- a/archetypes/simple-cli/pom.xml
+++ b/archetypes/simple-cli/pom.xml
@@ -19,8 +19,9 @@
 	<properties>
 		<maven.test.failure.ignore>true</maven.test.failure.ignore>
 		<spring.framework.version>2.5.5</spring.framework.version>
+		<bundle.symbolic.name>${pom.groupId}.sample.archetype.cli</bundle.symbolic.name>
 	</properties>
-	
+
 	<profiles>
 		<profile>
 			<id>strict</id>
@@ -77,6 +78,13 @@
 	</dependencies>
 
 	<build>
+		<extensions>
+			<extension>
+				<groupId>org.springframework.aws</groupId>
+				<artifactId>spring-aws-maven</artifactId>
+				<version>1.2.2</version>
+			</extension>
+		</extensions>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -99,7 +107,7 @@
 					<mainClass>org.springframework.batch.core.launch.support.CommandLineJobRunner</mainClass>
 					<arguments>
 						<!-- job configuration file -->
-						<argument>example/simpleJob.xml</argument>
+						<argument>classpath:/META-INF/spring/module-context.xml</argument>
 						<!-- job name -->
 						<argument>job1</argument>
 					</arguments>
@@ -115,4 +123,22 @@
 		</pluginRepository>
 	</pluginRepositories>
 
+	<distributionManagement>
+		<downloadUrl>http://www.springframework.org/download</downloadUrl>
+		<site>
+			<id>staging</id>
+			<url>file:///${user.dir}/archetypes/simple-cli/target/staging</url>
+		</site>
+		<repository>
+			<id>spring-milestone</id>
+			<name>Spring Milestone Repository</name>
+			<url>s3://maven.springframework.org/milestone</url>
+		</repository>
+		<snapshotRepository>
+			<id>spring-snapshot</id>
+			<name>Spring Snapshot Repository</name>
+			<url>s3://maven.springframework.org/snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+
 </project>
diff --git a/archetypes/simple-cli/src/main/resources/example/simpleJob.xml b/archetypes/simple-cli/src/main/resources/META-INF/spring/module-context.xml
similarity index 100%
rename from archetypes/simple-cli/src/main/resources/example/simpleJob.xml
rename to archetypes/simple-cli/src/main/resources/META-INF/spring/module-context.xml
diff --git a/archetypes/simple-cli/src/test/java/example/ExampleJobConfigurationTests.java b/archetypes/simple-cli/src/test/java/example/ExampleJobConfigurationTests.java
index ba8eea23c..99aff5cb2 100644
--- a/archetypes/simple-cli/src/test/java/example/ExampleJobConfigurationTests.java
+++ b/archetypes/simple-cli/src/test/java/example/ExampleJobConfigurationTests.java
@@ -38,7 +38,7 @@ public class ExampleJobConfigurationTests extends AbstractDependencyInjectionSpr
 	 * @see org.springframework.test.AbstractSingleSpringContextTests#getConfigLocations()
 	 */
 	protected String[] getConfigLocations() {
-		return new String[] {"example/simpleJob.xml"};
+		return new String[] {"/META-INF/spring/module-context.xml"};
 	}
 	
 	public void testSimpleProperties() throws Exception {