diff --git a/CMakeLists.txt b/CMakeLists.txt
index d32ed22ab8..56fc5cf1e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,8 @@ option(BuildJK2SPGame "Whether to create projects for the jk2 sp gamecode mod (j
 option(BuildJK2SPRdVanilla "Whether to create projects for the jk2 sp renderer (rdjosp-vanilla_x86.dll)" OFF)
 
 option(BuildTests "Whether to build automatic unit tests (requires Boost)" OFF)
+option(UseAddressSanitizer "Whether to enable runtime address sanitizer" OFF)
+option(UseUndefinedSanitizer "Whether to enable runtime Undefined Behavior sanitizer" OFF)
 
 include(CMakeDependentOption)
 cmake_dependent_option(BuildSymbolServer "Build WIP Windows Symbol Server (experimental and unused)" OFF "NOT WIN32 OR NOT MSVC" OFF)
@@ -234,6 +236,16 @@ elseif (("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_C_COMPILER_ID}" M
 	set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
 	set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
 
+	if(UseAddressSanitizer)
+		# also raise stack size drastically (to 64MiB), since the sanitizer adds overhead to stack frames
+		add_compile_options(-fsanitize=address)
+		add_link_options(-fsanitize=address -z stack-size=4000000)
+	endif()
+	if(UseUndefinedSanitizer)
+		add_compile_options(-fsanitize=undefined)
+		add_link_options(-fsanitize=undefined)
+	endif()
+
 	# additional flags for debug configuration
 	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb")
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb")