diff --git a/dist/.project b/dist/.project
new file mode 100644
index 000000000..78f38838c
--- /dev/null
+++ b/dist/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>dist</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
diff --git a/dist/pom.xml b/dist/pom.xml
index e013da294..d1d6c9724 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -17,10 +17,10 @@
 	</parent>
 
 	<modules>
-		<module>../infrastructure</module>
-		<module>../core</module>
-		<module>../execution</module>
-		<module>../samples</module>
+		<module>../spring-batch-infrastructure</module>
+		<module>../spring-batch-core</module>
+		<module>../spring-batch-execution</module>
+		<module>../spring-batch-samples</module>
 	</modules>
 
 	<build>
diff --git a/dist/src/assembly/no-dependencies.xml b/dist/src/assembly/no-dependencies.xml
index db89d36ab..895aaf6bb 100644
--- a/dist/src/assembly/no-dependencies.xml
+++ b/dist/src/assembly/no-dependencies.xml
@@ -10,30 +10,28 @@
 	<moduleSets>
 		<moduleSet>
 			<includes>
-				<include>org.springframework.batch:spring-batch-core</include>
-				<include>org.springframework.batch:spring-batch-execution</include>
-				<include>org.springframework.batch:spring-batch-infrastructure</include>
+				<include>
+					org.springframework.batch:spring-batch-core
+				</include>
+				<include>
+					org.springframework.batch:spring-batch-execution
+				</include>
+				<include>
+					org.springframework.batch:spring-batch-infrastructure
+				</include>
 			</includes>
-			<binaries>
-				<includeDependencies>false</includeDependencies>
-				<outputFileNameMapping>dist/${artifactId}-${version}.${extension}</outputFileNameMapping>
-				<unpack>false</unpack>
-			</binaries>
-		</moduleSet>
-		<moduleSet>
-			<includes>
-				<include>org.springframework.batch:spring-batch-core</include>
-				<include>org.springframework.batch:spring-batch-execution</include>
-				<include>org.springframework.batch:spring-batch-infrastructure</include>
-			</includes>
-			<binaries>
-				<includeDependencies>false</includeDependencies>
-				<outputFileNameMapping>dist/${artifactId}-${version}-sources.${extension}</outputFileNameMapping>
-				<unpack>false</unpack>
-				<includes>
-					<include>target/${artifactId}-${version}-sources.${extension}</include>
-				</includes>
-			</binaries>
+			<sources>
+				<includeModuleDirectory>false</includeModuleDirectory>
+				<fileSets>
+					<fileSet>
+						<directory>target</directory>
+						<outputDirectory>dist</outputDirectory>
+						<includes>
+							<include>*.jar</include>
+						</includes>
+					</fileSet>
+				</fileSets>
+			</sources>
 		</moduleSet>
 	</moduleSets>
 </assembly>