diff --git a/.appveyor.yml b/.appveyor.yml
index 395b92f..1e0eaf5 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -3,11 +3,11 @@ os: Visual Studio 2015
 clone_depth: 1
 environment:
   matrix:
-  - CMAKE_ARGS: -DSDL2PP_ENABLE_LIVE_TESTS=OFF -DCMAKE_CXX_FLAGS="/wd4275 /wd4251 /EHsc" -G "Visual Studio 14 2015"
+  - CMAKE_ARGS: -DSDL2PP_ENABLE_LIVE_TESTS=OFF -DCMAKE_CXX_FLAGS="/wd4275 /wd4251 /EHsc /WX" -G "Visual Studio 14 2015"
     PREFIX: c:\usr_msvc
     MSVC:
     MINGW32: rem
-  - CMAKE_ARGS: -DCMAKE_C_COMPILER=mingw32-gcc -DCMAKE_CXX_COMPILER=mingw32-g++ -DCMAKE_MAKE_PROGRAM=mingw32-make.exe -DCMAKE_VERBOSE_MAKEFILE=ON -DSDL2PP_ENABLE_LIVE_TESTS=OFF -DSDL2PP_WITH_WERROR=YES -G "MinGW Makefiles"
+  - CMAKE_ARGS: -DCMAKE_C_COMPILER=mingw32-gcc -DCMAKE_CXX_COMPILER=mingw32-g++ -DCMAKE_MAKE_PROGRAM=mingw32-make.exe -DCMAKE_VERBOSE_MAKEFILE=ON -DSDL2PP_ENABLE_LIVE_TESTS=OFF -DCMAKE_CXX_FLAGS="-Werror" -G "MinGW Makefiles"
     PREFIX: c:\usr_mingw32
     MINGW32:
     MSVC: rem
diff --git a/.travis.yml b/.travis.yml
index 5590a0e..9691b32 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,6 +41,8 @@ before_install:
   - export SDL_VIDEODRIVER=x11
   - export DISPLAY=:99.0
 
+  - export CXXFLAGS="${CXXFLAGS} -Werror"
+
 script:
   - export PREFIX=`pwd`.prefix
   - cmake . -DCMAKE_INSTALL_PREFIX=${PREFIX} -DSDL2PP_WITH_WERROR=YES -DSDL2PP_CXXSTD=${CXXSTD} ${CMAKE_EXTRA_ARGS}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a02376..c831586 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,10 +11,6 @@ SET(SDL2PP_PATCH_VERSION 0)
 
 SET(SDL2PP_VERSION "${SDL2PP_MAJOR_VERSION}.${SDL2PP_MINOR_VERSION}.${SDL2PP_PATCH_VERSION}")
 
-# there are functions present on wiki, but not yet in stable SDL2 releases;
-# we hide these under following options
-OPTION(SDL2PP_WITH_WERROR "Make warnings fatal" OFF)
-
 SET(SDL2PP_CXXSTD "c++11" CACHE STRING "Used c++ standard")
 
 IF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
@@ -69,7 +65,6 @@ ENDIF(SDL2PP_WITH_MIXER)
 # compiler flags & definitions
 IF(MSVC)
 	SET(SDL2PP_WARNINGS "${SDL2PP_WARNINGS} /W3")
-	SET(SDL2PP_WERROR_FLAG "/WX")
 ELSE(MSVC)
 	SET(CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_DEBUG} --coverage")
 	SET(CMAKE_EXE_LINKER_FLAGS_COVERAGE "${CMAKE_EXE_LINKER_FLAGS_DEBUG} --coverage")
@@ -77,7 +72,6 @@ ELSE(MSVC)
 
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=${SDL2PP_CXXSTD}")
 	SET(SDL2PP_WARNINGS "${SDL2PP_WARNINGS} -Wall -Wextra -pedantic")
-	SET(SDL2PP_WERROR_FLAG "-Werror")
 
 	INCLUDE(AppendCXXFlagIfSupported)
 
@@ -108,10 +102,6 @@ CHECK_COMPILE(
 
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SDL2PP_WARNINGS}")
 
-IF(SDL2PP_WITH_WERROR)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SDL2PP_WERROR_FLAG}")
-ENDIF(SDL2PP_WITH_WERROR)
-
 # config.h
 CONFIGURE_FILE(
 	SDL2pp/Config.hh.in