diff --git a/CMakeLists.txt b/CMakeLists.txt
index 445688cc..2eb80d5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -378,11 +378,12 @@ else()
     target_link_options( ${EXECUTABLE_NAME} PRIVATE "-sALLOW_MEMORY_GROWTH" )
     target_link_options( ${EXECUTABLE_NAME} PRIVATE "-sNO_DISABLE_EXCEPTION_CATCHING" )
     target_link_options( ${EXECUTABLE_NAME} PRIVATE "-lidbfs.js" )
+    target_link_options( ${EXECUTABLE_NAME} PRIVATE "-sCASE_INSENSITIVE_FS" )
     target_link_options( ${EXECUTABLE_NAME} PRIVATE "-sMODULARIZE" )
     target_link_options( ${EXECUTABLE_NAME} PRIVATE "-sEXPORTED_RUNTIME_METHODS=callMain,addRunDependency,removeRunDependency" )
     target_link_options( ${EXECUTABLE_NAME} PRIVATE "-sEXPORT_ALL" )
     target_link_options( ${EXECUTABLE_NAME} PRIVATE "-sEXPORT_NAME=fallout2ce" )
-    target_link_options( ${EXECUTABLE_NAME} PRIVATE "-gsource-map" )
+    target_link_options( ${EXECUTABLE_NAME} PRIVATE "$<$<CONFIG:DEBUG>:-gsource-map>" )
 endif()
 
 target_link_libraries(${EXECUTABLE_NAME} ${ZLIB_LIBRARIES})
diff --git a/cmake/toolchain/Emscripten.cmake b/cmake/toolchain/Emscripten.cmake
index 8e023c50..43e10fdd 100644
--- a/cmake/toolchain/Emscripten.cmake
+++ b/cmake/toolchain/Emscripten.cmake
@@ -1,13 +1,19 @@
 set( CMAKE_SYSTEM_NAME      "Emscripten" )
 
+add_compile_definitions("DEBUG=$<CONFIG:Debug>")
+
 set( CMAKE_C_COMPILER                   "emcc" )
 set( CMAKE_CXX_COMPILER                 "em++" )
-set( CMAKE_C_FLAGS                      "--use-port=sdl2 \
+set( CMAKE_C_FLAGS                      "${CMAKE_C_FLAGS} \
+                                        --use-port=sdl2 \
                                         --use-port=sdl2_mixer \
-                                        --use-port=zlib \
-                                        -gsource-map" )
-set( CMAKE_CXX_FLAGS                    "--use-port=sdl2 \
+                                        --use-port=zlib" )
+set( CMAKE_CXX_FLAGS                    "${CMAKE_CXX_FLAGS} \
+                                        --use-port=sdl2 \
                                         --use-port=sdl2_mixer \
-                                        --use-port=zlib \
-                                        -gsource-map" )
+                                        --use-port=zlib" )
+
+set( CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -gsource-map")
+set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -gsource-map")
+
 set( EXECUTABLE_NAME fallout2-ce.js )
\ No newline at end of file