diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0738eb387d..c006237850 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,7 +22,7 @@ set(BRO_SCRIPT_SOURCE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/scripts)
 get_filename_component(BRO_SCRIPT_INSTALL_PATH ${BRO_SCRIPT_INSTALL_PATH}
     ABSOLUTE)
 
-set(BRO_PLUGIN_INSTALL_PATH ${BRO_ROOT_DIR}/share/bro/plugins)
+set(BRO_PLUGIN_INSTALL_PATH ${BRO_ROOT_DIR}/lib/bro/plugins)
 set(BRO_MAGIC_INSTALL_PATH ${BRO_ROOT_DIR}/share/bro/magic)
 set(BRO_MAGIC_SOURCE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/magic/database)
 
diff --git a/aux/bro-aux b/aux/bro-aux
index 6c5db7af6e..715937ad72 160000
--- a/aux/bro-aux
+++ b/aux/bro-aux
@@ -1 +1 @@
-Subproject commit 6c5db7af6e93406be498b24f8a2d67ca281c1a03
+Subproject commit 715937ad72d9158d8c3142f81ee7005601d75db8
diff --git a/cmake b/cmake
index fc53d57770..6eb4cbfbc7 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit fc53d57770c86fbf9bd2d9694f06a1d539ebe35f
+Subproject commit 6eb4cbfbc75f0bd13e247150b19932905a85e10c