diff --git a/CHANGES b/CHANGES
index b7ac264b0b..f03fcdcb5a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+6.0.0-dev.605 | 2023-05-18 08:54:41 -0700
+
+  * Fix CMake ordering issue leaving configuration paths unset. (Robin Sommer, Corelight)
+
 6.0.0-dev.602 | 2023-05-17 16:10:57 +0200
 
   * Add license header to zeek-config*.h and zeek-version.h (Arne Welzel, Corelight)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b918db39b..1c3fa86af0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1108,19 +1108,6 @@ if (NOT BINARY_PACKAGING_MODE)
     set(ZEEK_DIST ${PROJECT_SOURCE_DIR})
 endif ()
 
-string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zeek-version.h.in
-               ${CMAKE_CURRENT_BINARY_DIR}/zeek-version.h)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zeek-version.h DESTINATION include/zeek)
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zeek-config.h.in
-               ${CMAKE_CURRENT_BINARY_DIR}/zeek-config.h)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zeek-config.h DESTINATION include/zeek)
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zeek-config-paths.h.in
-               ${CMAKE_CURRENT_BINARY_DIR}/zeek-config-paths.h)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zeek-config-paths.h DESTINATION include/zeek)
-
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink "." "${CMAKE_CURRENT_BINARY_DIR}/zeek")
 
@@ -1275,6 +1262,19 @@ configure_file(${CMAKE_SOURCE_DIR}/spicy-path.in ${CMAKE_BINARY_DIR}/spicy-path
 configure_file(${CMAKE_SOURCE_DIR}/hilti-cxx-include-dirs.in
                ${CMAKE_BINARY_DIR}/hilti-cxx-include-dirs @ONLY)
 
+string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zeek-version.h.in
+               ${CMAKE_CURRENT_BINARY_DIR}/zeek-version.h)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zeek-version.h DESTINATION include/zeek)
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zeek-config.h.in
+               ${CMAKE_CURRENT_BINARY_DIR}/zeek-config.h)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zeek-config.h DESTINATION include/zeek)
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zeek-config-paths.h.in
+               ${CMAKE_CURRENT_BINARY_DIR}/zeek-config-paths.h)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zeek-config-paths.h DESTINATION include/zeek)
+
 # ##############################################################################
 # Packaging Setup
 
diff --git a/VERSION b/VERSION
index eb5039df81..1a7c449e64 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.0-dev.602
+6.0.0-dev.605