diff --git a/CompilerChecks.cmake b/CompilerChecks.cmake
index 7219aafc..5762ee15 100644
--- a/CompilerChecks.cmake
+++ b/CompilerChecks.cmake
@@ -48,6 +48,12 @@ if (UNIX)
         list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector")
     endif()
     unset(CMAKE_REQUIRED_FLAGS)
+
+    if (PICKY_DEVELOPER)
+        add_c_compiler_flag("-Werror" SUPPORTED_COMPILER_FLAGS)
+        add_c_compiler_flag("-Wno-error=deprecated-declarations" SUPPORTED_COMPILER_FLAGS)
+        add_c_compiler_flag("-Wno-error=tautological-compare" SUPPORTED_COMPILER_FLAGS)
+    endif()
 endif()
 
 if (MSVC)
diff --git a/DefineOptions.cmake b/DefineOptions.cmake
index 3b9e4279..0834acd9 100644
--- a/DefineOptions.cmake
+++ b/DefineOptions.cmake
@@ -19,6 +19,8 @@ option(WITH_NACL "Build with libnacl (curve25519)" ON)
 option(WITH_SYMBOL_VERSIONING "Build with symbol versioning" ON)
 option(WITH_ABI_BREAK "Allow ABI break" OFF)
 option(FUZZ_TESTING "Build with fuzzer for the server" OFF)
+option(PICKY_DEVELOPER "Build with picky developer flags" OFF)
+
 if (WITH_ZLIB)
     set(WITH_LIBZ ON)
 else (WITH_ZLIB)