diff --git a/.travis.yml b/.travis.yml
index c5bd24590..651eeab2d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,7 @@ install:
 script:
   - ./gradlew check
   - ./gradlew createZipDistribution
+  - "[ $TRAVIS_BRANCH == 'master' ] && [ $TRAVIS_PULL_REQUEST == 'false' ] && ./gradlew uploadArchives;"
 
 before_deploy:
   - export RELEASE_DIST=$(ls build/distributions/*.zip)
diff --git a/version.gradle b/version.gradle
index 38231bc99..40e934278 100644
--- a/version.gradle
+++ b/version.gradle
@@ -68,7 +68,8 @@ task configureVersionInfo {
         if (System.env.TRAVIS_TAG != null) {
             jmeGitTag = System.env.TRAVIS_TAG
         }
-        if (System.env.TRAVIS_PULL_REQUEST != null) {
+        if (System.env.TRAVIS_PULL_REQUEST != null && 
+            System.env.TRAVIS_PULL_REQUEST != "false") {
             jmeBranchName += "-pr-" + System.env.TRAVIS_PULL_REQUEST
         }