diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 773a9a6efc..7ade806201 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -593,7 +593,7 @@ zeek_include_directories(
 install(DIRECTORY ${PROJECT_BINARY_DIR}/scripts/base/bif DESTINATION ${ZEEK_SCRIPT_INSTALL_PATH}/base)
 
 # Create plugin directory at install time.
-install(DIRECTORY DESTINATION ${BRO_PLUGIN_INSTALL_PATH})
+install(DIRECTORY DESTINATION ${ZEEK_PLUGIN_DIR})
 
 # Make clean removes the bif directory.
 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${PROJECT_BINARY_DIR}/scripts/base/bif)
diff --git a/src/util-config.h.in b/src/util-config.h.in
index efe0179390..6272fba391 100644
--- a/src/util-config.h.in
+++ b/src/util-config.h.in
@@ -1,3 +1,3 @@
 #define ZEEK_SCRIPT_INSTALL_PATH "@ZEEK_SCRIPT_INSTALL_PATH@"
-#define BRO_PLUGIN_INSTALL_PATH "@BRO_PLUGIN_INSTALL_PATH@"
+#define BRO_PLUGIN_INSTALL_PATH "@ZEEK_PLUGIN_DIR@"
 #define DEFAULT_ZEEKPATH "@DEFAULT_ZEEKPATH@"
diff --git a/zeek-config.in b/zeek-config.in
index 4ac0a51478..98396dc989 100755
--- a/zeek-config.in
+++ b/zeek-config.in
@@ -9,7 +9,7 @@ config_dir=@ZEEK_ETC_INSTALL_DIR@
 have_spicy=@USE_SPICY_ANALYZERS@
 include_dir=@CMAKE_INSTALL_PREFIX@/include
 lib_dir=@CMAKE_INSTALL_FULL_LIBDIR@
-plugin_dir=@BRO_PLUGIN_INSTALL_PATH@
+plugin_dir=@ZEEK_PLUGIN_DIR@
 prefix=@CMAKE_INSTALL_PREFIX@
 python_dir=@PY_MOD_INSTALL_DIR@
 script_dir=@ZEEK_SCRIPT_INSTALL_PATH@
diff --git a/zkg-config.in b/zkg-config.in
index 1d8dec61d2..b13ad218ba 100644
--- a/zkg-config.in
+++ b/zkg-config.in
@@ -5,5 +5,5 @@ zeek = https://github.com/zeek/packages
 [paths]
 state_dir = @ZEEK_ZKG_STATE_DIR@
 script_dir = @ZEEK_SCRIPT_INSTALL_PATH@/site
-plugin_dir = @BRO_PLUGIN_INSTALL_PATH@
+plugin_dir = @ZEEK_PLUGIN_DIR@
 bin_dir = @CMAKE_INSTALL_PREFIX@/bin