diff --git a/build-common-java.xml b/build-common-java.xml
index 0316858209e35e..818dd432e6a4d7 100644
--- a/build-common-java.xml
+++ b/build-common-java.xml
@@ -116,6 +116,13 @@
 		</javadoc>
 	</target>
 
+	<target name="javadoc-jar">
+		<jar
+			basedir="${javadoc.dir}"
+			jarfile="${jar.file}-javadoc.jar"
+		/>
+	</target>
+
 	<target name="deploy" depends="jar">
 		<copy file="${jar.file}.jar" todir="${deploy.dir}" />
 	</target>
diff --git a/build-maven.xml b/build-maven.xml
index 92372585838e02..7157c5279ca502 100644
--- a/build-maven.xml
+++ b/build-maven.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project name="portal-maven" default="deploy-artifacts">
+<project name="portal-maven" default="deploy-artifacts" xmlns:antelope="antlib:ise.antelope.tasks">
 	<property name="project.dir" value="." />
 
 	<import file="build-common.xml" />
@@ -32,6 +32,28 @@
 			<arg value="-Dversion=${maven.version}" />
 		</exec>
 
+		<if>
+			<not>
+				<or>
+					<equals arg1="${packaging}" arg2="war" />
+					<antelope:endswith string="${maven.version}" with="SNAPSHOT" />
+				</or>
+			</not>
+			<then>
+				<exec dir="." executable="${maven.executable}" failonerror="true">
+					<arg value="deploy:deploy-file" />
+					<arg value="-DartifactId=${artifact.id}" />
+					<arg value="-Dfile=${artifact.id}/${artifact.id}-javadoc.${packaging}" />
+					<arg value="-DgeneratePom=false" />
+					<arg value="-DgroupId=com.liferay.portal" />
+					<arg value="-Dpackaging=javadoc" />
+					<arg value="-DrepositoryId=${maven.repository.id}" />
+					<arg value="-Durl=${maven.url}" />
+					<arg value="-Dversion=${maven.version}" />
+				</exec>
+			</then>
+		</if>
+
 		<delete file="tools/maven/${artifact.id}.pom" />
 	</target>
 
@@ -99,6 +121,7 @@
 	</target>-->
 
 	<target name="deploy-release-artifacts">
+		<antcall target="javadoc-jar" />
 		<antcall target="deploy-artifacts">
 			<param name="maven.repository.id" value="sonatype-staging" />
 			<param name="maven.url" value="http://oss.sonatype.org/service/local/staging/deploy/maven2" />
@@ -206,4 +229,19 @@
 			<param name="maven.version" value="${lp.version}-SNAPSHOT" />
 		</antcall>
 	</target>
+
+	<target name="javadoc-jar">
+		<ant dir="portal-client" target="javadoc" inheritAll="false" />
+		<ant dir="portal-client" target="javadoc-jar" inheritAll="false" />
+		<ant dir="portal-impl" target="javadoc" inheritAll="false" />
+		<ant dir="portal-impl" target="javadoc-jar" inheritAll="false" />
+		<ant dir="portal-service" target="javadoc" inheritAll="false" />
+		<ant dir="portal-service" target="javadoc-jar" inheritAll="false" />
+		<ant dir="util-bridges" target="javadoc" inheritAll="false" />
+		<ant dir="util-bridges" target="javadoc-jar" inheritAll="false" />
+		<ant dir="util-java" target="javadoc" inheritAll="false" />
+		<ant dir="util-java" target="javadoc-jar" inheritAll="false" />
+		<ant dir="util-taglib" target="javadoc" inheritAll="false" />
+		<ant dir="util-taglib" target="javadoc-jar" inheritAll="false" />
+	</target>
 </project>
\ No newline at end of file