diff --git a/spring-boot-javadoc/pom.xml b/spring-boot-docs/pom.xml
similarity index 76%
rename from spring-boot-javadoc/pom.xml
rename to spring-boot-docs/pom.xml
index b524d508bb..edd0e4bb29 100644
--- a/spring-boot-javadoc/pom.xml
+++ b/spring-boot-docs/pom.xml
@@ -8,8 +8,7 @@
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 		<relativePath>../spring-boot-parent</relativePath>
 	</parent>
-	<artifactId>spring-boot-javadoc</artifactId>
-	<packaging>jar</packaging>
+	<artifactId>spring-boot-docs</artifactId>
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -61,19 +60,43 @@
 							</execution>
 						</executions>
 					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>package-and-attach-docs-zip</id>
+								<phase>package</phase>
+								<goals>
+									<goal>run</goal>
+								</goals>
+								<configuration>
+									<target>
+										<zip
+											destfile="${project.build.directory}/${project.name}-${project.version}.zip">
+											<zipfileset
+												src="${project.build.directory}/${project.name}-${project.version}-javadoc.jar"
+												includes="**/*.html" prefix="api" />
+										</zip>
+
+									</target>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>build-helper-maven-plugin</artifactId>
 						<executions>
 							<execution>
-								<id>attach-javadoc-zip</id>
+								<id>attach-zip</id>
 								<goals>
 									<goal>attach-artifact</goal>
 								</goals>
 								<configuration>
 									<artifacts>
 										<artifact>
-											<file>${project.build.directory}/${project.name}-${project.version}-javadoc.jar</file>
+											<file>${project.build.directory}/${project.name}-${project.version}.zip</file>
 											<type>zip;zip.type=docs;zip.deployed=false</type>
 										</artifact>
 									</artifacts>
diff --git a/spring-boot-full-build/pom.xml b/spring-boot-full-build/pom.xml
index e40acbb0a9..4e3f40b8ae 100644
--- a/spring-boot-full-build/pom.xml
+++ b/spring-boot-full-build/pom.xml
@@ -18,7 +18,7 @@
 		<module>../spring-boot-cli</module>
 		<module>../spring-boot-samples</module>
 		<module>../spring-boot-integration-tests</module>
-		<module>../spring-boot-javadoc</module>
+		<module>../spring-boot-docs</module>
 	</modules>
 	<profiles>
 		<profile>