diff --git a/.github/travis_deploy.sh b/.github/travis_deploy.sh
index b7d9f8dc..99bdc294 100644
--- a/.github/travis_deploy.sh
+++ b/.github/travis_deploy.sh
@@ -15,7 +15,7 @@ source "$argv0dir/travis_init.sh" || exit 1
 set -x # debug
 
 if [[ $BM_X == rebuild-stubs ]]; then exit 0; fi
-# save space
+# save space and do not deploy debug builds
 if [[ $BM_B =~ (^|\+)coverage($|\+) ]]; then exit 0; fi
 if [[ $BM_B =~ (^|\+)debug($|\+) ]]; then exit 0; fi
 if [[ $BM_B =~ (^|\+)sanitize($|\+) ]]; then exit 0; fi
@@ -99,6 +99,7 @@ else
         [[ $cpu == amd64 ]] && os=win64
     fi
     d=$cpu-$os
+    unset cpu os
 fi
 d=$d-$BM_C-$BM_B
 
@@ -115,6 +116,7 @@ for exeext in .exe .out; do
         cp -p -i $f  $d/upx-git-${rev:0:12}$exeext
         sha256sum -b $d/upx-git-${rev:0:12}$exeext
     fi
+    unset f
 done
 
 # /***********************************************************************
diff --git a/.github/travis_init.sh b/.github/travis_init.sh
index dd672f7d..c450220b 100644
--- a/.github/travis_init.sh
+++ b/.github/travis_init.sh
@@ -25,6 +25,9 @@ declare +x UPX_AUTOMATIC_BUILDS_SSL_KEY UPX_AUTOMATIC_BUILDS_SSL_IV
 # compatibility wrappers
 if [[ $TRAVIS_OS_NAME == osx ]]; then
 # use GNU coreutils ("brew install coreutils")
+chmod() {
+    gchmod "$@"
+}
 date() {
     gdate "$@"
 }
@@ -132,7 +135,7 @@ fi # BM_CROSS
 if [[ "$CC" == "false" ]]; then # generic
 if [[ -z $BM_CROSS ]]; then
     case $BM_C in
-        clang | clang-m?? | clang-3.4-m?? | clang-[678][0-9][0-9]-m??)
+        clang | clang-m?? | clang-3.4-m?? | clang-[6789][0-9][0-9]-m??)
             CC="clang"; CXX="clang++" ;; # standard system compiler
         clang-[3].[0-9]-m??)
             v=${BM_C:6:3}; CC="clang-$v"; CXX="clang++-$v"; SCAN_BUILD="scan-build-$v" ;;
diff --git a/.travis.yml b/.travis.yml
index 0050eb6b..edf1c443 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -184,11 +184,11 @@ matrix:
       addons: { apt: { sources: *S, packages: [ "clang-3.9" ] } }
     - os: linux
       compiler: gcc
-      env: CROSS=arm-linux-gnueabi C=gcc-4.6 T=SKIP
+      env: CROSS=arm-linux-gnueabi C=gcc-4.6 T=qemu
       addons: { apt: { packages: [ "g++-arm-linux-gnueabi", "qemu-user" ] } }
     - os: linux
       compiler: gcc
-      env: CROSS=arm-linux-gnueabihf C=gcc-4.6 T=SKIP
+      env: CROSS=arm-linux-gnueabihf C=gcc-4.6 T=qemu
       addons: { apt: { packages: [ "g++-arm-linux-gnueabihf", "qemu-user" ] } }
     - os: linux
       compiler: gcc
@@ -224,6 +224,14 @@ matrix:
       osx_image: xcode8.3
       compiler: clang
       env: C=clang-802-m64
+    - os: osx
+      osx_image: xcode9
+      compiler: clang
+      env: C=clang-900-m32
+    - os: osx
+      osx_image: xcode9
+      compiler: clang
+      env: C=clang-900-m64
 
 install:
   - uname -a; pwd; id; umask
diff --git a/src/stub/scripts/upx-clang-format b/src/stub/scripts/upx-clang-format
index 5f29729f..b4f86eb6 100755
--- a/src/stub/scripts/upx-clang-format
+++ b/src/stub/scripts/upx-clang-format
@@ -23,9 +23,10 @@ s="$s"' AccessModifierOffset: -4, '
 #s="$s"' AllowShortFunctionsOnASingleLine: None, '
 s="$s"' AlwaysBreakTemplateDeclarations: true, '
 s="$s"' ColumnLimit: 100, '
+####s="$s"' FixNamespaceComments: false, '                  # added in llvm-5.0
 s="$s"' IndentWidth: 4, '
-s="$s"' SortIncludes: false, '
-s="$s"' SpaceAfterCStyleCast: true, '
+s="$s"' SortIncludes: false, '                          # added in llvm-3.8
+s="$s"' SpaceAfterCStyleCast: true, '                   # added in llvm-3.6
 s="$s"' Standard: Cpp03, '
 CLANG_FORMAT_STYLE='-style={'"$s"' }'