diff --git a/CHANGES b/CHANGES
index 42c5239d0e..32dd03a153 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+6.0.0-dev.510 | 2023-05-05 20:14:21 +0200
+
+  * Skip version.h by default for Zeek sources (Dominik Charousset, Corelight)
+
 6.0.0-dev.508 | 2023-05-05 08:48:10 -0700
 
   * generate-docs: Only update submodule pointer during scheduled builds (Tim Wojtulewicz, Corelight)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43952dc00d..628987568f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,6 +192,11 @@ set_target_properties(zeek_internal PROPERTIES EXPORT_NAME Internal)
 install(TARGETS zeek_internal EXPORT ZeekTargets)
 target_compile_features(zeek_internal INTERFACE ${ZEEK_CXX_STD})
 
+# Skip including the version.h header from the zeek-config.h header. This is
+# mainly to optimize build times on CI by making sure the compiler cache remains
+# valid for longer.
+target_compile_definitions(zeek_internal INTERFACE ZEEK_CONFIG_SKIP_VERSION_H)
+
 # Target for bundling the creation of auto-generated files.
 add_custom_target(zeek_autogen_files)
 
diff --git a/VERSION b/VERSION
index d2b6709cd5..8dc59a172a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.0-dev.508
+6.0.0-dev.510