diff --git a/CMakeLists.txt b/CMakeLists.txt
index 089d3cc2f6..2b19ddd830 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -426,7 +426,6 @@ set(cmake_current_binary_dir "${CMAKE_CURRENT_BINARY_DIR}")
 set(cmake_install_prefix "${CMAKE_INSTALL_PREFIX}")
 set(cmake_source_dir "${CMAKE_SOURCE_DIR}")
 set(zeek_script_install_path "${ZEEK_SCRIPT_INSTALL_PATH}")
-set(ZEEK_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/zeek/cmake")
 if ( MSVC )
     string(REGEX REPLACE "^([A-Za-z]):/(.*)" "/\\1/\\2" bro_plugin_install_path "${bro_plugin_install_path}")
     string(REGEX REPLACE "^([A-Za-z]):/(.*)" "/\\1/\\2" cmake_binary_dir "${cmake_binary_dir}")
@@ -436,6 +435,9 @@ if ( MSVC )
     string(REGEX REPLACE "^([A-Za-z]):/(.*)" "/\\1/\\2" zeek_script_install_path "${zeek_script_install_path}")
 endif ()
 
+# Set the path where we install the ZeekConfig.cmake file and related files.
+set(ZEEK_CMAKE_CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/zeek/cmake")
+
 if ( NOT ZEEK_ETC_INSTALL_DIR )
     set(ZEEK_ETC_INSTALL_DIR ${ZEEK_ROOT_DIR}/etc)
 endif ()
@@ -502,6 +504,7 @@ string(REGEX REPLACE "[^a-zA-Z0-9_\$]" "_" VERSION_C_IDENT "${VERSION_C_IDENT}")
 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)
 endif()
 
 if ( NOT BINARY_PACKAGING_MODE )
@@ -1291,7 +1294,7 @@ configure_file(src/ZeekPluginConfig.cmake.in ZeekPluginConfig.cmake @ONLY)
 configure_package_config_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/src/ZeekConfig.cmake.in"
   "${CMAKE_CURRENT_BINARY_DIR}/ZeekConfig.cmake"
-  INSTALL_DESTINATION "${ZEEK_CMAKE_INSTALL_DIR}")
+  INSTALL_DESTINATION "${ZEEK_CMAKE_CONFIG_DIR}")
 write_basic_package_version_file(
   "${CMAKE_CURRENT_BINARY_DIR}/ZeekConfigVersion.cmake"
   VERSION ${ZEEK_VERSION_NUMBER}
@@ -1303,18 +1306,18 @@ export(EXPORT ZeekTargets FILE ZeekTargets.cmake NAMESPACE Zeek::)
 # Write the bootstrap file for dynamic plugins. Needed by ZeekPlugin.cmake.
 configure_file(src/ZeekPluginBootstrap.cmake.in ZeekPluginBootstrap.cmake @ONLY)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ZeekPluginBootstrap.cmake"
-        DESTINATION "${ZEEK_CMAKE_INSTALL_DIR}")
+        DESTINATION "${ZEEK_CMAKE_CONFIG_DIR}")
 
 install(
   FILES
     "${CMAKE_CURRENT_BINARY_DIR}/ZeekConfig.cmake"
     "${CMAKE_CURRENT_BINARY_DIR}/ZeekConfigVersion.cmake"
   DESTINATION
-    "${ZEEK_CMAKE_INSTALL_DIR}")
+    "${ZEEK_CMAKE_CONFIG_DIR}")
 
 install(
   EXPORT ZeekTargets
-  DESTINATION "${ZEEK_CMAKE_INSTALL_DIR}"
+  DESTINATION "${ZEEK_CMAKE_CONFIG_DIR}"
   NAMESPACE Zeek::)
 
 ########################################################################
diff --git a/cmake b/cmake
index 9d42fed681..ddbea121d7 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 9d42fed6811d011890af99d5de57c4d0089deaf6
+Subproject commit ddbea121d75a416cba8db5d8907e89875054579e
diff --git a/src/ZeekPluginBootstrap.cmake.in b/src/ZeekPluginBootstrap.cmake.in
index fa854a9c52..fc2090bfc9 100644
--- a/src/ZeekPluginBootstrap.cmake.in
+++ b/src/ZeekPluginBootstrap.cmake.in
@@ -2,14 +2,14 @@
 # the CMake configuration step to plugins.
 
 # Allows scripts such as ZeekPlugin.cmake to locate the Zeek CMake package.
-set(ZEEK_CMAKE_PACKAGE_DIR "@ZEEK_CMAKE_INSTALL_DIR@"
-    CACHE PATH "Path the CMake package for Zeek." FORCE)
+set(ZEEK_CMAKE_CONFIG_DIR "@ZEEK_CMAKE_CONFIG_DIR@"
+    CACHE PATH "Internal Zeek variable: the CMake package path for Zeek." FORCE)
 
 # Allows scripts to locate files in the Zeek install tree.
 set(ZEEK_CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
-    CACHE PATH "Path the install prefix of Zeek." FORCE)
+    CACHE PATH "Internal Zeek variable: CMAKE_INSTALL_PREFIX of Zeek." FORCE)
 
 # Set ZEEK_PLUGIN_SCRIPTS_PATH for ZeekPlugin.cmake. We install the scripts into
 # the package directory.
-set(ZEEK_PLUGIN_SCRIPTS_PATH "${ZEEK_CMAKE_PACKAGE_DIR}"
+set(ZEEK_PLUGIN_SCRIPTS_PATH "${ZEEK_CMAKE_CONFIG_DIR}"
     CACHE PATH "Path to utility scripts for building Zeek plugins." FORCE)
diff --git a/zeek-config.in b/zeek-config.in
index 84a78850e8..4ac0a51478 100755
--- a/zeek-config.in
+++ b/zeek-config.in
@@ -4,7 +4,7 @@ binpac_root=@ZEEK_CONFIG_BINPAC_ROOT_DIR@
 broker_root=@ZEEK_CONFIG_BROKER_ROOT_DIR@
 btest_tools_dir=@ZEEK_CONFIG_BTEST_TOOLS_DIR@
 build_type=@CMAKE_BUILD_TYPE_LOWER@
-cmake_dir=@ZEEK_CMAKE_INSTALL_DIR@
+cmake_dir=@ZEEK_CMAKE_CONFIG_DIR@
 config_dir=@ZEEK_ETC_INSTALL_DIR@
 have_spicy=@USE_SPICY_ANALYZERS@
 include_dir=@CMAKE_INSTALL_PREFIX@/include