--- build.xml
+++ build.xml
@@ -361,7 +361,7 @@
 		</if>
 	</target>
 
-	<target name="dist" depends="init, compile">
+	<target name="dist" depends="init, compile, javadoc">
 
 		<delete file="${buildDir}/${fullProdName}-bin.jar" />
 		<delete file="${distDir}/${fullProdName}.jar" />
@@ -1175,4 +1175,22 @@
 			</sequential>
 		</for>
 	</target>
+  <target name="javadoc" 
+          description="Creates the API documentation">
+    <mkdir dir="${buildDir}/javadoc"/>
+    <javadoc packagenames="com.mysql.jdbc.*,org.gjt.mm.mysql.*"
+             sourcepath="${sourceDir}"
+             destdir="${buildDir}/javadoc"
+             author="true"
+             version="true"
+             use="true"
+             splitindex="true"
+             noindex="false"
+             windowtitle="MySQL Connector/J v${version}"
+             doctitle="MySQL Connector/J v${version}&lt;br&gt;API Specification"
+             header="&lt;b&gt;MySQL Connector/J size='-1'&gt;${version}&lt;/font&gt;&lt;/b&gt;">
+      <classpath refid="project.build.classpath" />
+    </javadoc>
+  </target>
+
 </project>