diff --git a/.travis.yml b/.travis.yml
index ea3a26c6..f4f85e03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,12 +18,21 @@ before_install:
 install:
   - if [ $TRAVIS_OS_NAME = linux ]; then
       if [ "$CXX" = "clang++" ]; then
-        export CXX=clang++-3.5;
+        export CXX=clang++-3.7;
       elif [ "$CXX" = "g++" ]; then
         export CXX=g++-5;
       fi;
     elif [ $TRAVIS_OS_NAME = osx ]; then
-       brew outdated boost || brew upgrade boost;
+      if [ "$CXX" = "clang++" ]; then
+        brew install llvm36 && brew link --force llvm36;
+        export CXX="clang++-3.6 -stdlib=libc++";
+        export CXXFLAGS="$CXXFLAGS -nostdinc++ -I/usr/local/opt/llvm36/lib/llvm-3.6/include/c++/v1";
+        export LDFLAGS="$LDFLAGS -L/usr/local/opt/llvm36/lib/llvm-3.6/lib";
+      elif [ "$CXX" = "g++" ]; then
+        brew outdated gcc || brew upgrade gcc;
+        brew unlink boost; brew install boost --cc=gcc-5;
+        export CXX=g++-5;
+      fi;
     fi;
 env:
   global:
@@ -34,9 +43,9 @@ addons:
     sources:
       - boost-latest
       - ubuntu-toolchain-r-test
-      - llvm-toolchain-precise-3.5
+      - llvm-toolchain-precise-3.7
     packages:
-      - clang-3.5
+      - clang-3.7
       - libstdc++-5-dev
       - g++-5
       - libncursesw5-dev
@@ -50,4 +59,9 @@ addons:
     build_command: "make -j4"
     branch_pattern: coverity-scan
 
+matrix:
+  exclude:
+    - compiler: gcc
+      os: osx
+
 script: cd src && make && make test
diff --git a/src/Makefile b/src/Makefile
index c69dad7b..72191e50 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -32,7 +32,7 @@ mandir := $(DESTDIR)$(PREFIX)/share/man/man1
 os := $(shell uname)
 
 ifeq ($(os),Darwin)
-    LIBS += -lncurses -lboost_regex-mt
+    LIBS += -lncurses -lboost_regex
     CPPFLAGS += -I$(PREFIX)/opt/ncurses/include -I$(PREFIX)/opt/boost/include -I/opt/local/include
     LDFLAGS += -L$(PREFIX)/opt/ncurses/lib -L$(PREFIX)/opt/boost/lib -L/opt/local/lib
 else ifeq ($(os),FreeBSD)