diff --git a/.travis.yml b/.travis.yml
index 3e4cabf..3a31375 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -239,6 +239,7 @@ before_install:
 script:
   - echo CC=${CC} CXX=${CXX} TYPE=${TYPE} STRICT=${STRICT} ASAN=${ASAN} DBSIM=${DBSIM}
   - cmake . -DCMAKE_BUILD_TYPE=${TYPE}
+            -DWSREP_LIB_MAINTAINER_MODE:BOOL=ON
             -DWSREP_LIB_STRICT_BUILD_FLAGS:BOOL=${STRICT}
             -DWSREP_LIB_WITH_UNIT_TESTS:BOOL=ON
             -DWSREP_LIB_WITH_DBSIM:BOOL=${DBSIM}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7ec935..eb6904e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,14 +24,18 @@ option(WSREP_LIB_WITH_TSAN "Enable thread sanitizer" OFF)
 option(WSREP_LIB_WITH_DOCUMENTATION "Generate documentation" OFF)
 option(WSREP_LIB_WITH_COVERAGE "Compile with coverage instrumentation" OFF)
 
-option(WSREP_LIB_STRICT_BUILD_FLAGS "Compile with strict build flags")
+option(WSREP_LIB_STRICT_BUILD_FLAGS "Compile with strict build flags" OFF)
+option(WSREP_LIB_MAINTAINER_MODE "Fail compilation on any warnings" OFF)
 
 # CXX flags
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Woverloaded-virtual -g")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Woverloaded-virtual -g")
 
 if (WSREP_LIB_STRICT_BUILD_FLAGS)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weffc++")
 endif()
+if (WSREP_LIB_MAINTAINER_MODE)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+endif()
 
 check_include_file("${CMAKE_CURRENT_SOURCE_DIR}/wsrep/wsrep_api.h" HAVE_WSREP_API_HPP)
 include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")