diff --git a/.travis.yml b/.travis.yml
index cd4c519c..ca0c5449 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,8 @@ install:
        export CXXFLAGS="--coverage -g";
        export CFLAGS="--coverage -g";
        export LDFLAGS="--coverage";
+   elif [[ $(uname -s) == 'Linux' ]]; then
+       export CXX=clang++;
    fi;
  - make
 
diff --git a/Makefile b/Makefile
index 2c84f928..57a2346e 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ MANDIR ?= $(PREFIX)/share/man/man1/
 CC := $(CC)
 CXX := $(CXX)
 CFLAGS := $(CFLAGS)
-CXXFLAGS := $(CXXFLAGS) -std=c++0x
+CXXFLAGS := $(CXXFLAGS) -std=c++11
 LDFLAGS := $(LDFLAGS)
 
 all: tippecanoe tippecanoe-enumerate tippecanoe-decode tile-join