diff --git a/.travis.yml b/.travis.yml
index 168064470..a138153b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ before_install:
 script:
     - if [[ "${TRAVIS_OS_NAME}" == "linux" && "$TARGET" == "main" ]]; then ./package/linux/travis-build-main.sh; fi
     - if [[ "${TRAVIS_OS_NAME}" == "linux" && "$TARGET" == "cpp"  ]]; then ./package/linux/travis-build-cpp.sh; fi
-    - if [[ "${TRAVIS_OS_NAME}" == "osx"   && "$TARGET" == "main" ]]; then ./package/osx/travis-build-main.sh; fi
+    - if [[ "${TRAVIS_OS_NAME}" == "osx"   && "$TARGET" == "main" ]]; then travis_wait 60 ./package/osx/travis-build-main.sh; fi
     - if [[ "${TRAVIS_OS_NAME}" == "osx"   && "$TARGET" == "cpp"  ]]; then ./package/osx/travis-build-cpp.sh; fi
 
 branches:
diff --git a/package/osx/travis-build-cpp.sh b/package/osx/travis-build-cpp.sh
index ba43a1ebe..078593aff 100755
--- a/package/osx/travis-build-cpp.sh
+++ b/package/osx/travis-build-cpp.sh
@@ -8,7 +8,7 @@ mkdir -p $CACHE
 
 ( sudo Xvfb :99 -ac -screen 0 1024x768x8; echo ok )&
 brew update -v
-brew upgrade ccache || brew install ccache
+brew install ccache || brew upgrade ccache
 
 if [[ "$WXVERSION" != "pkg" ]]; then
     WXVER_EXPANDED=${WXVERSION:0:1}.${WXVERSION:1:1}.${WXVERSION:2:1}
@@ -26,7 +26,7 @@ if [[ "$WXVERSION" != "pkg" ]]; then
     export PATH=${PATH}:${WXDIR}
     cd $TRAVIS_BUILD_DIR # go back to the build dir
 else
-    brew upgrade wxmac || brew install wxmac # install via homebrew
+    brew install wxmac || brew upgrade wxmac # install via homebrew
 fi
 
 mkdir build && cd build
diff --git a/package/osx/travis-build-main.sh b/package/osx/travis-build-main.sh
index b8b646d6c..957732361 100755
--- a/package/osx/travis-build-main.sh
+++ b/package/osx/travis-build-main.sh
@@ -2,10 +2,10 @@
 set -euo pipefail
 
 brew update -v
-brew upgrade boost     || brew install boost
-brew upgrade perl      || brew install perl
-brew upgrade cpanminus || brew install cpanminus
-brew upgrade wxwidgets || brew install wxwidgets
+brew install boost     || brew upgrade boost
+brew install perl      || brew upgrade perl
+brew install cpanminus || brew upgrade cpanminus
+brew install wxwidgets || brew upgrade wxwidgets
 brew link --overwrite perl cpanminus
 
 export SLIC3R_STATIC=1
diff --git a/package/osx/travis-deploy-main.sh b/package/osx/travis-deploy-main.sh
index 56c0c4977..d73423dd4 100755
--- a/package/osx/travis-deploy-main.sh
+++ b/package/osx/travis-deploy-main.sh
@@ -2,4 +2,4 @@
 set -euo pipefail
 
 package/osx/make_dmg.sh
-package/deploy/sftp.sh mac ~/slic3r-upload.rsa *.bz2 Slic3r*.dmg
+package/deploy/sftp.sh mac ~/slic3r-upload.rsa *.bz2 slic3r*.dmg