diff --git a/.travis.yml b/.travis.yml
index cd85483e9..39db95b67 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ install:
 script:
 - xvfb-run mvn clean verify -B -q
 - bash ./dependent-projects-trigger.sh $AUTH_TOKEN
+- bash ./upload-javascript.sh $GH_TOKEN
 - jdk_switcher use oraclejdk7
 - ./build-maven-jars.py "install -Dgpg.skip"
 sudo: false
@@ -20,4 +21,6 @@ cache:
   - "$HOME/.m2"
   - "$TRAVIS_BUILD_DIR/com.ibm.wala.core.testdata/ocaml/ocamljava-2.0-alpha1/lib"
 env:
-  secure: KcugjQYnBqeZ7XenZD5QY7jhekVPO0QpQyjDUteLytaokhyRK2g6eNvr/pPerN2uWUvsPwO18P9F+oOupge1cpPZf4cEY8RzLIromyUoRWd6JA0SKciUYdN2kSqnC4uZSJGXeGLoroyEEL4Q2sqimpkbIGxgxYtVniWgJULOyR4=
+  secure:
+  - KcugjQYnBqeZ7XenZD5QY7jhekVPO0QpQyjDUteLytaokhyRK2g6eNvr/pPerN2uWUvsPwO18P9F+oOupge1cpPZf4cEY8RzLIromyUoRWd6JA0SKciUYdN2kSqnC4uZSJGXeGLoroyEEL4Q2sqimpkbIGxgxYtVniWgJULOyR4=
+  - RfbFC/VI0rVv7IAYDwlYathScTuqEEZMpXK7q+6cHiPD3JrW5XCMWTphvUPDmPGc736f/V2rpYp8wMO4PmQkTXy9Eqv7Havcy6x8kEg8JRVE7/0R9TPvI8u9spIYEU4/l5aCADI+wKGza2kBqZY3gOuyVzYrfC5juJSozrfNfbw=
diff --git a/pom.xml b/pom.xml
index fef03c7e2..41e7907d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -240,9 +240,27 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.14.1</version>
       </plugin>		
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>2.10.3</version>
+            <configuration>
+	      <aggregate>true</aggregate>
+              <additionalparam>-Xdoclint:none</additionalparam>
+            </configuration>
+            <executions>
+                <execution>
+                    <id>javadoc</id>
+                    <goals>
+                        <goal>javadoc</goal>
+                    </goals>
+                    <phase>generate-sources</phase>
+                </execution>
+            </executions>
+        </plugin>
 </plugins>
 </build>
-<pluginRepositories>
+  <pluginRepositories>
   <pluginRepository>
     <id>sonatype-public-repository</id>
     <url>https://oss.sonatype.org/content/groups/public</url>
diff --git a/upload-javascript.sh b/upload-javascript.sh
new file mode 100644
index 000000000..67060db63
--- /dev/null
+++ b/upload-javascript.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+if [ "$TRAVIS_REPO_SLUG" == "wala/WALA" ] &&
+   [ "$TRAVIS_PULL_REQUEST" == "false" ] &&
+   [ "$TRAVIS_BRANCH" == "master" ]; then
+
+    echo -e "Publishing javadoc...\n"
+
+    cd $HOME
+    git config --global user.email "travis@travis-ci.org"
+    git config --global user.name "travis-ci"
+    git clone --quiet https://${GH_TOKEN}@github.com/wala/javadoc > /dev/null
+
+    cd javadoc
+    git rm -rf *
+    cp -Rf $HOME/build/wala/WALA/target/site/apidocs/* .
+    git add -f .
+    git commit -m "Latest javadoc on successful travis build $TRAVIS_BUILD_NUMBER auto-pushed to gh-pages"
+    git push > /dev/null
+
+    echo -e "Published Javadoc to gh-pages.\n"
+
+fi