diff --git a/.travis.yml b/.travis.yml
index 9ba59ab5..effa0157 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ os:
   # - linux
   - osx
 sudo: required
-dist: stretch
+dist: xenial
 addons:
   apt:
     packages:
@@ -29,14 +29,13 @@ compiler:
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libressl miniupnpc && brew upgrade boost ; fi
-  # - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew unlink boost openssl && brew link boost openssl -f ; fi
 env:
   matrix:
     - BUILD_TYPE=Release UPNP=ON
     - BUILD_TYPE=Release UPNP=OFF
   exclude:
-  - os: osx
-    compiler: g++
+    - os: osx
+      compiler: g++
 script:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd build && cmake -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DWITH_UPNP=${UPNP} && make ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]];   then make HOMEBREW=1 USE_UPNP=${UPNP} ; fi
diff --git a/Makefile.osx b/Makefile.osx
index 1a480dde..22274dc0 100644
--- a/Makefile.osx
+++ b/Makefile.osx
@@ -1,4 +1,6 @@
-#CXX = clang++
+ifndef TRAVIS_OS_NAME
+  CXX = clang++
+endif
 CXXFLAGS = -Os -Wall -std=c++11 -DMAC_OSX
 #CXXFLAGS = -g -O2 -Wall -std=c++11
 INCFLAGS = -I/usr/local/include