diff --git a/.travis.yml b/.travis.yml
index a138153b1..a75e619c5 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 travis_wait 60 ./package/osx/travis-build-main.sh; fi
+    - if [[ "${TRAVIS_OS_NAME}" == "osx"   && "$TARGET" == "main" ]]; then ./package/osx/travis-build-main.sh; fi
     - if [[ "${TRAVIS_OS_NAME}" == "osx"   && "$TARGET" == "cpp"  ]]; then ./package/osx/travis-build-cpp.sh; fi
 
 branches:
@@ -72,7 +72,8 @@ matrix:
             - package/linux/travis-deploy-cpp.sh
 
         - os: osx
-          osx_image: xcode8 # OS X 10.11
+          #osx_image: xcode8 # OS X 10.11
+          osx_image: xcode9.2 # OS X 10.12
           env:
             - TARGET=main
           cache:
diff --git a/package/deploy/sftp.sh b/package/deploy/sftp.sh
index 14ffa6aab..350b3db4d 100755
--- a/package/deploy/sftp.sh
+++ b/package/deploy/sftp.sh
@@ -18,7 +18,7 @@ fi
 
 if [ -s $KEY ]; then
     for i in $FILES; do 
-         filepath=$(readlink -f "$i")
+         filepath=$i  # this is expected to be an absolute path
          tmpfile=$(mktemp)
          echo put $filepath > $tmpfile 
          sftp -b $tmpfile -i$KEY "${UPLOAD_USER}@dl.slic3r.org:$DIR/"
diff --git a/package/linux/travis-deploy-main.sh b/package/linux/travis-deploy-main.sh
index 3cbc85727..a57ec6010 100755
--- a/package/linux/travis-deploy-main.sh
+++ b/package/linux/travis-deploy-main.sh
@@ -8,6 +8,6 @@ LD_LIBRARY_PATH=$WXDIR/lib package/linux/make_archive.sh linux-x64
 
 package/linux/appimage.sh x86_64
 
-package/deploy/sftp.sh linux ~/slic3r-upload.rsa *.bz2 Slic3r*.AppImage
+package/deploy/sftp.sh linux ~/slic3r-upload.rsa `pwd`/*.bz2 `pwd`/Slic3r*.AppImage
 package/deploy/sftp-symlink.sh linux ~/slic3r-upload.rsa AppImage Slic3r*.AppImage
 package/deploy/sftp-symlink.sh linux ~/slic3r-upload.rsa tar.bz2 *.bz2
diff --git a/package/osx/travis-deploy-main.sh b/package/osx/travis-deploy-main.sh
index d73423dd4..7f6e509c3 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 `pwd`/slic3r*.dmg