diff --git a/compiler/cpp/CMakeLists.txt b/compiler/cpp/CMakeLists.txt
index 43c37cc..e98adb7 100644
--- a/compiler/cpp/CMakeLists.txt
+++ b/compiler/cpp/CMakeLists.txt
@@ -149,6 +149,11 @@
 
 install(TARGETS thrift DESTINATION bin)
 
+# mingw32 does not support c++0x features
+if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
+set(CMAKE_CXX_FLAGS "-std=c++0x")
+endif()
+
 # create a Distribution Package for the Apache Thrift Compiler
 set(CPACK_PACKAGE_NAME "Apache Thrift")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Apache Thrift Compiler")
diff --git a/compiler/cpp/README.md b/compiler/cpp/README.md
index 3c40809..017617f 100644
--- a/compiler/cpp/README.md
+++ b/compiler/cpp/README.md
@@ -17,14 +17,9 @@
 Now open the folder build_ec using eclipse.
 
 
-### Cross compile using mingw32
+### Cross compile using mingw32 and generate a Windows Installer with CPack
 
     mkdir build_mingw32 && cd build_mingw32
-    cmake -DCMAKE_TOOLCHAIN_FILE=../../../contrib/mingw32-toolchain.cmake ..
-    make
-
-### Generate a Windows Installer Package of the Apache Thrift Compiler
-
     cmake -DCMAKE_TOOLCHAIN_FILE=../../../contrib/mingw32-toolchain.cmake -DTHRIFT_COMPILER_HS=OFF ..
     cpack
 
diff --git a/compiler/cpp/src/thriftl.ll b/compiler/cpp/src/thriftl.ll
index af67ff9..5afc601 100644
--- a/compiler/cpp/src/thriftl.ll
+++ b/compiler/cpp/src/thriftl.ll
@@ -52,10 +52,6 @@
 
 #ifdef _MSC_VER
 #include "windows/config.h"
-#else
-#ifndef _WIN32
-#include "config.h"
-#endif
 #endif
 #include "main.h"
 #include "globals.h"