diff --git a/CHANGES b/CHANGES
index 6878a04798..fce9f46e76 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+8.0.0-dev.498 | 2025-06-24 16:30:52 +0200
+
+  * GH-4587: Build builtin Spicy analyzers in debug mode if debug mode is enabled (Benjamin Bannier, Corelight)
+
 8.0.0-dev.496 | 2025-06-24 14:00:39 +0100
 
   * Default canonifier change to only remove first timestamp in line (Johanna Amann, Corelight)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 05ad9d0caa..815d0f1793 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -649,6 +649,7 @@ if (ENABLE_DEBUG)
     set(VERSION_C_IDENT "${VERSION_C_IDENT}_debug")
     target_compile_definitions(zeek_internal INTERFACE DEBUG)
     target_compile_definitions(zeek_dynamic_plugin_base INTERFACE DEBUG)
+    set(SPICYZ_FLAGS "-d" CACHE STRING "Additional flags to pass to spicyz for builtin analyzers")
 endif ()
 
 if (NOT BINARY_PACKAGING_MODE)
diff --git a/VERSION b/VERSION
index ddae2b79ec..0e3be39f37 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.0.0-dev.496
+8.0.0-dev.498