diff --git a/pom.xml b/pom.xml
index f6497c62..b4bf40bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.vault</groupId>
@@ -29,6 +30,9 @@
 		<dist.id>spring-vault</dist.id>
 		<project.root>${basedir}</project.root>
 		<shared.resources>${project.build.directory}/shared-resources</shared.resources>
+		
+		<!-- To be overridden by individual modules -->
+		<java-module-name></java-module-name>
 	</properties>
 
 	<inceptionYear>2016</inceptionYear>
@@ -206,6 +210,20 @@
 				</executions>
 			</plugin>
 
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifestEntries>
+							<Implementation-Title>${project.name}</Implementation-Title>
+							<Implementation-Version>${project.version}</Implementation-Version>
+							<Automatic-Module-Name>${java-module-name}</Automatic-Module-Name>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
+
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>animal-sniffer-maven-plugin</artifactId>
@@ -262,6 +280,12 @@
 					<version>3.0.1</version>
 				</plugin>
 
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-jar-plugin</artifactId>
+					<version>3.0.2</version>
+				</plugin>
+
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-javadoc-plugin</artifactId>
@@ -502,7 +526,7 @@
 
 			<!--
 					Profile to be activated when building the distribution atrifacts.
-
+	
 					Generates reference documentation, aggregates JavaDoc etc. Has to be combined with
 					profiles "release" or "milestone" to deploy artifacts into the appropriate places.
 				-->
@@ -589,17 +613,17 @@
 									<target>
 										<copy todir="${project.root}/target/site/reference/html">
 											<fileset dir="${shared.resources}/asciidoc" erroronmissingdir="false">
-												<include name="**/*.css" />
+												<include name="**/*.css"/>
 											</fileset>
-											<flattenmapper />
+											<flattenmapper/>
 										</copy>
 										<copy todir="${project.root}/target/site/reference/html/images">
 											<fileset dir="${basedir}/src/main/asciidoc" erroronmissingdir="false">
-												<include name="**/*.png" />
-												<include name="**/*.gif" />
-												<include name="**/*.jpg" />
+												<include name="**/*.png"/>
+												<include name="**/*.gif"/>
+												<include name="**/*.jpg"/>
 											</fileset>
-											<flattenmapper />
+											<flattenmapper/>
 										</copy>
 									</target>
 								</configuration>
@@ -615,9 +639,9 @@
 									<target>
 										<copy todir="${project.build.directory}/schemas">
 											<fileset dir="${basedir}" erroronmissingdir="false">
-												<include name="**/src/main/resources/**/config/spring-*.xsd" />
+												<include name="**/src/main/resources/**/config/spring-*.xsd"/>
 											</fileset>
-											<flattenmapper />
+											<flattenmapper/>
 										</copy>
 									</target>
 								</configuration>
@@ -631,8 +655,12 @@
 								<phase>process-resources</phase>
 								<configuration>
 									<target>
-										<copy failonerror="false" file="${project.build.directory}/generated-docs/index.pdf" tofile="${project.root}/target/site/reference/pdf/${dist.id}-reference.pdf" />
-										<copy failonerror="false" file="${project.build.directory}/generated-docs/index.epub" tofile="${project.root}/target/site/reference/epub/${dist.id}-reference.epub" />
+										<copy failonerror="false"
+											  file="${project.build.directory}/generated-docs/index.pdf"
+											  tofile="${project.root}/target/site/reference/pdf/${dist.id}-reference.pdf"/>
+										<copy failonerror="false"
+											  file="${project.build.directory}/generated-docs/index.epub"
+											  tofile="${project.root}/target/site/reference/epub/${dist.id}-reference.epub"/>
 									</target>
 								</configuration>
 								<goals>
diff --git a/spring-vault-core/pom.xml b/spring-vault-core/pom.xml
index 13d24584..cbcebaaf 100644
--- a/spring-vault-core/pom.xml
+++ b/spring-vault-core/pom.xml
@@ -15,6 +15,10 @@
 	<description>Spring Vault Core Components</description>
 	<packaging>jar</packaging>
 
+	<properties>
+		<java-module-name>spring.vault.core</java-module-name>
+	</properties>
+
 	<build>
 		<resources>
 			<resource>
diff --git a/spring-vault-repository/pom.xml b/spring-vault-repository/pom.xml
index 333fc28e..ffcc2e3c 100644
--- a/spring-vault-repository/pom.xml
+++ b/spring-vault-repository/pom.xml
@@ -14,6 +14,10 @@
 	<name>Spring Vault Repository</name>
 	<description>Spring Vault Repository support</description>
 	<packaging>jar</packaging>
+	
+	<properties>
+		<java-module-name>spring.vault.repository</java-module-name>
+	</properties>
 
 	<build>
 		<resources>