diff --git a/CHANGES b/CHANGES
index da6f3457c9..6641588884 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.6-beta2-24 | 2018-10-05 14:24:34 -0500
+
+  * GH-184: add `bro-config --build_type`, outputs CMake build type (Jon Siwek, Corelight)
+
 2.6-beta2-22 | 2018-10-04 11:31:48 -0500
 
   * Add return value checks for some RPC parsing functions (Jon Siwek, Corelight)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80e3d5049a..7353ff9c3b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -230,6 +230,7 @@ if ( NOT BINARY_PACKAGING_MODE )
     set(BRO_DIST ${CMAKE_SOURCE_DIR})
 endif ()
 
+string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/bro-config.h.in
                ${CMAKE_CURRENT_BINARY_DIR}/bro-config.h)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/VERSION b/VERSION
index 40564de710..ffa82dd240 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6-beta2-22
+2.6-beta2-24
diff --git a/aux/bro-aux b/aux/bro-aux
index cdc9303cf4..4aceb3d1ef 160000
--- a/aux/bro-aux
+++ b/aux/bro-aux
@@ -1 +1 @@
-Subproject commit cdc9303cf497ad0b0cbbe3af8f17ec3628953d0b
+Subproject commit 4aceb3d1ef14d14fae1ee86ae4ba17647293a902
diff --git a/bro-config.in b/bro-config.in
index be9ee551b3..9228271394 100755
--- a/bro-config.in
+++ b/bro-config.in
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 version=@VERSION@
+build_type=@CMAKE_BUILD_TYPE_LOWER@
 prefix=@CMAKE_INSTALL_PREFIX@
 script_dir=@BRO_SCRIPT_INSTALL_PATH@
 site_dir=@BRO_SCRIPT_INSTALL_PATH@/site
@@ -16,7 +17,7 @@ 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] [--binpac_root] [--caf_root] [--broker_root]"
+Usage: bro-config [--version] [--build_type] [--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
@@ -36,6 +37,9 @@ while [ $# -ne 0 ]; do
     --prefix)
       echo $prefix
       ;;
+    --build_type)
+      echo $build_type
+      ;;
     --script_dir)
       echo $script_dir
       ;;