diff --git a/Makefile b/Makefile
index 6a9e3063de39..50048165bb8d 100644
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,10 @@ lint: cpplint pylint jnilint
 doc:
 	doxygen docs/Doxyfile
 
+javadoc:
+	# build artifact is in jvm/core/target/site/apidocs
+	cd jvm && mvn javadoc:javadoc
+
 # Cython build
 cython:
 	cd python; python setup.py build_ext --inplace
diff --git a/docs/api_links.rst b/docs/api_links.rst
index 909cfe367f29..d9b2406206b3 100644
--- a/docs/api_links.rst
+++ b/docs/api_links.rst
@@ -1,7 +1,8 @@
-Links to C++ and JS API References
+Links to API References
 ==================================
 
 This page contains links to API references that are build with different doc build system.
 
 * `C++ doyxgen API <doxygen/index.html>`_
 * `Javascript jsdoc API <jsdoc/index.html>`_
+* `Java Javadoc API <javadoc/index.html>`_
diff --git a/tests/scripts/task_python_docs.sh b/tests/scripts/task_python_docs.sh
index 72c9fbf6c0dd..55ec0dddd45f 100755
--- a/tests/scripts/task_python_docs.sh
+++ b/tests/scripts/task_python_docs.sh
@@ -12,6 +12,10 @@ make doc
 jsdoc web/tvm_runtime.js web/README.md || exit -1
 mv out docs/_build/html/jsdoc || exit -1
 
+# Java doc
+make javadoc || exit -1
+mv jvm/core/target/site/apidocs docs/_build/html/javadoc || exit -1
+
 rm -rf python/tvm/*.pyc python/tvm/*/*.pyc python/tvm/*/*/*.pyc
 
 cd docs