diff --git a/cmake b/cmake
index b191c36167..edaaa3aed6 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit b191c36167bc0d6bd9f059b01ad4c99be98488d9
+Subproject commit edaaa3aed6d2f8d89c0981a5c914d151ed2c7e4d
diff --git a/src/ZeekPluginBootstrap.cmake.in b/src/ZeekPluginBootstrap.cmake.in
index 1e1e11713c..4a56007d41 100644
--- a/src/ZeekPluginBootstrap.cmake.in
+++ b/src/ZeekPluginBootstrap.cmake.in
@@ -17,3 +17,7 @@ set(ZEEK_CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
 # the package directory.
 set(ZEEK_PLUGIN_SCRIPTS_PATH "${ZEEK_CMAKE_CONFIG_DIR}"
     CACHE PATH "Path to utility scripts for building Zeek plugins." FORCE)
+
+# The CMAKE_BUILD_TYPE type to use for external plugins if not overridden.
+set(ZEEK_CMAKE_BUILD_TYPE "@CMAKE_BUILD_TYPE@"
+    CACHE PATH "Internal Zeek variable: CMAKE_BUILD_TYPE of Zeek." FORCE)