diff --git a/.travis.yml b/.travis.yml
index 5709939..4d78ce8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ compiler:
 before_install:
 - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq ; fi
 - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update ; fi
-script: CXXFLAGS='-std=c++0x' cmake . && make
+script: cmake . && make
 matrix:
   exclude:
   - compiler: gcc
diff --git a/CMakeLists.txt b/CMakeLists.txt
index acf771d..bb5f1a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,5 +2,9 @@ cmake_minimum_required (VERSION 2.8)
 
 project (pe-parse)
 
+if(UNIX)
+  set(CMAKE_CXX_FLAGS "-std=c++0x")
+endif(UNIX)
+
 add_subdirectory(parser-library)
 add_subdirectory(dump-prog)