diff --git a/pom.xml b/pom.xml
index b47e1c028..33ef39510 100644
--- a/pom.xml
+++ b/pom.xml
@@ -221,6 +221,7 @@
 						<manifestEntries>
 							<Implementation-Title>${project.artifactId}</Implementation-Title>
 							<Implementation-Version>${project.version}</Implementation-Version>
+							<Automatic-Module-Name>${module.name}</Automatic-Module-Name>
 						</manifestEntries>
 					</archive>
 				</configuration>
@@ -230,6 +231,7 @@
 				<artifactId>maven-javadoc-plugin</artifactId>
 				<version>${maven-javadoc-plugin.version}</version>
 				<configuration>
+					<sourcepath>src/main/java</sourcepath>
 					<excludePackageNames>
 						org.springframework.batch.sample.*
 					</excludePackageNames>
diff --git a/spring-batch-core/pom.xml b/spring-batch-core/pom.xml
index ad205216c..0880ddb25 100644
--- a/spring-batch-core/pom.xml
+++ b/spring-batch-core/pom.xml
@@ -18,6 +18,10 @@
 		<developerConnection>git@github.com:spring-projects/spring-batch.git</developerConnection>
 	</scm>
 
+	<properties>
+		<module.name>spring.batch.core</module.name>
+	</properties>
+
 	<dependencies>
 		<!-- production dependencies -->
 		<dependency>
diff --git a/spring-batch-docs/pom.xml b/spring-batch-docs/pom.xml
index 59d5156c5..3d6845c4f 100644
--- a/spring-batch-docs/pom.xml
+++ b/spring-batch-docs/pom.xml
@@ -10,6 +10,10 @@
     <name>Spring Batch Docs</name>
     <description>Spring Batch documentation</description>
 
+    <properties>
+        <module.name>spring.batch.docs</module.name>
+    </properties>
+
     <build>
         <plugins>
             <plugin>
diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml
index 89bbdf51f..75115ece9 100644
--- a/spring-batch-infrastructure/pom.xml
+++ b/spring-batch-infrastructure/pom.xml
@@ -21,6 +21,10 @@
 		<developerConnection>git@github.com:spring-projects/spring-batch.git</developerConnection>
 	</scm>
 
+	<properties>
+		<module.name>spring.batch.infrastructure</module.name>
+	</properties>
+
 	<dependencies>
 		<!-- production dependencies -->
 		<dependency>
diff --git a/spring-batch-integration/pom.xml b/spring-batch-integration/pom.xml
index 568f929fe..4091e1180 100644
--- a/spring-batch-integration/pom.xml
+++ b/spring-batch-integration/pom.xml
@@ -17,6 +17,10 @@
 		<developerConnection>git@github.com:spring-projects/spring-batch.git</developerConnection>
 	</scm>
 
+	<properties>
+		<module.name>spring.batch.integration</module.name>
+	</properties>
+
 	<dependencies>
 		<!-- production dependencies -->
 		<dependency>
@@ -167,4 +171,5 @@
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
+
 </project>
diff --git a/spring-batch-samples/pom.xml b/spring-batch-samples/pom.xml
index 400f2e826..661906aaa 100644
--- a/spring-batch-samples/pom.xml
+++ b/spring-batch-samples/pom.xml
@@ -13,6 +13,7 @@
 
 	<properties>
 		<environment>hsql</environment>
+		<module.name>spring.batch.samples</module.name>
 	</properties>
 
 	<dependencyManagement>
@@ -254,5 +255,4 @@
 			</plugin>
 		</plugins>
 	</build>
-
 </project>
diff --git a/spring-batch-test/pom.xml b/spring-batch-test/pom.xml
index 9ae188448..d04a11718 100644
--- a/spring-batch-test/pom.xml
+++ b/spring-batch-test/pom.xml
@@ -18,6 +18,10 @@
 		<developerConnection>git@github.com:spring-projects/spring-batch.git</developerConnection>
 	</scm>
 
+	<properties>
+		<module.name>spring.batch.test</module.name>
+	</properties>
+
 	<dependencies>
 		<!-- production dependencies -->
 		<dependency>
@@ -121,4 +125,5 @@
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
+
 </project>