diff --git a/CHANGES b/CHANGES
index 2809b30da0..6b5905ee3f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,10 @@
 
+2.5-775 | 2018-07-24 16:39:34 -0500
+
+  * Add broker/binpac/caf dirs to bro-config script (Jon Siwek, Corelight)
+
+  * Exclude CMakeFiles from header installation path (Jon Siwek, Corelight)
+
 2.5-773 | 2018-07-24 15:04:41 +0000
 
   * BIT-1950: Support PPPoE over QinQ (Jon Siwek, Corelight)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd47aaaf9b..5f4f949a6f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -238,6 +238,20 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bro-config.h.in
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/bro-config.h DESTINATION include/bro)
 
+if ( CAF_ROOT_DIR )
+  set(BRO_CONFIG_CAF_ROOT_DIR ${CAF_ROOT_DIR})
+else ()
+  set(BRO_CONFIG_CAF_ROOT_DIR ${BRO_ROOT_DIR})
+endif ()
+
+if ( BinPAC_ROOT_DIR )
+  set(BRO_CONFIG_BINPAC_ROOT_DIR ${BinPAC_ROOT_DIR})
+else ()
+  set(BRO_CONFIG_BINPAC_ROOT_DIR ${BRO_ROOT_DIR})
+endif ()
+
+set(BRO_CONFIG_BROKER_ROOT_DIR ${BRO_ROOT_DIR})
+
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bro-config.in
                ${CMAKE_CURRENT_BINARY_DIR}/bro-config @ONLY)
 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bro-config DESTINATION bin)
diff --git a/VERSION b/VERSION
index cc077245e0..4ef74ff31b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5-773
+2.5-775
diff --git a/aux/binpac b/aux/binpac
index bfdb7a8194..6c0bf00a5f 160000
--- a/aux/binpac
+++ b/aux/binpac
@@ -1 +1 @@
-Subproject commit bfdb7a8194a84a6298f8776d7ac7132313742715
+Subproject commit 6c0bf00a5f1f63c2d8c35f9193d12a72eb0c0c79
diff --git a/aux/bro-aux b/aux/bro-aux
index 0c60d51cf7..ee71fe58d3 160000
--- a/aux/bro-aux
+++ b/aux/bro-aux
@@ -1 +1 @@
-Subproject commit 0c60d51cf7faac478397bde72e7ead536365aa2d
+Subproject commit ee71fe58d392812f09c3d08ec2c69bc9b757c086
diff --git a/bro-config.in b/bro-config.in
index bd02d80bb2..be9ee551b3 100755
--- a/bro-config.in
+++ b/bro-config.in
@@ -11,9 +11,12 @@ cmake_dir=@CMAKE_INSTALL_PREFIX@/share/bro/cmake
 include_dir=@CMAKE_INSTALL_PREFIX@/include/bro
 bropath=@DEFAULT_BROPATH@
 bro_dist=@BRO_DIST@
+binpac_root=@BRO_CONFIG_BINPAC_ROOT_DIR@
+caf_root=@BRO_CONFIG_CAF_ROOT_DIR@
+broker_root=@BRO_CONFIG_BROKER_ROOT_DIR@
 
 usage="\
-Usage: bro-config [--version] [--prefix] [--script_dir] [--site_dir] [--plugin_dir] [--config_dir] [--python_dir] [--include_dir] [--cmake_dir] [--bropath] [--bro_dist]"
+Usage: bro-config [--version] [--prefix] [--script_dir] [--site_dir] [--plugin_dir] [--config_dir] [--python_dir] [--include_dir] [--cmake_dir] [--bropath] [--bro_dist] [--binpac_root] [--caf_root] [--broker_root]"
 
 if [ $# -eq 0 ] ; then
       echo "${usage}" 1>&2
@@ -60,6 +63,15 @@ while [ $# -ne 0 ]; do
     --bro_dist)
       echo $bro_dist
       ;;
+    --binpac_root)
+      echo $binpac_root
+      ;;
+    --caf_root)
+      echo $caf_root
+      ;;
+    --broker_root)
+      echo $broker_root
+      ;;
     *)
       echo "${usage}" 1>&2
       exit 1
diff --git a/cmake b/cmake
index b4906b02b4..c4c2d6eeb7 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit b4906b02b4a9a4ceeecd17f2a61e7ce87f784b2a
+Subproject commit c4c2d6eeb7609836255abb054b91c4039bb7e276