diff --git a/.gitignore b/.gitignore
index 8cb1c3137..51c9c43b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ build
 testData
 testCache
 server.config
+docs/
 
 # Jacoco
 jacoco.exec
diff --git a/.travis.yml b/.travis.yml
index 6cc997657..4b5562f0f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,6 @@ before_install:
     - mkdir "$ANDROID_HOME/licenses" || true
     - echo "d56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license"
 
-script:
-  - ./gradlew clean testDebugUnitTest jacocoTestReport
-
 after_success:
   - ./gradlew coveralls
   - codecov
@@ -26,10 +23,22 @@ cache:
     - $HOME/.gradle
     - $HOME/.m2/repository
 
-deploy:
-  provider: script
-  script: ./gradlew bintrayUpload
-  skip_cleanup: true
-  on:
-    branch: master
-    tags: true
+jobs:
+  include:
+    - stage: test
+      script: ./gradlew clean testDebugUnitTest jacocoTestReport
+    - stage: release
+      script: ./gradlew javadocRelease
+      deploy:
+        - provider: pages
+          skip_cleanup: true
+          github_token: $GITHUB_TOKEN # Set in travis-ci.org dashboard
+          local_dir: docs/
+          on:
+            all_branches: true
+        - provider: script
+          script: ./gradlew bintrayUpload
+          skip_cleanup: true
+          on:
+            branch: master
+            tags: true
diff --git a/Parse/build.gradle b/Parse/build.gradle
index 4c7d4c373..24221915b 100644
--- a/Parse/build.gradle
+++ b/Parse/build.gradle
@@ -69,6 +69,7 @@ android.libraryVariants.all { variant ->
 
     def javadoc = task("javadoc${variant.name.capitalize()}", type: Javadoc) {
         description "Generates Javadoc for $variant.name."
+        destinationDir = rootProject.file("docs/api")
         source = variant.javaCompile.source
         ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"
         classpath = files(variant.javaCompile.classpath.files) + files(ext.androidJar)