diff --git a/CHANGES b/CHANGES
index 91bbce365f..487da9d5c0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,10 @@
 
+2.6-22 | 2018-12-10 11:16:53 -0600
+
+  * Introduce --enable-static-broker configuration option. (Johanna Amann)
+
+    This option builds the bundled broker (and caf) statically.
+
 2.6-20 | 2018-12-07 16:36:35 -0600
 
   * Update github/download links (Jon Siwek, Corelight)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7353ff9c3b..523093d34d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -271,9 +271,16 @@ if ( BROKER_ROOT_DIR )
   set(brodeps ${brodeps} ${BROKER_LIBRARY} ${CAF_LIBRARIES})
   include_directories(BEFORE ${BROKER_INCLUDE_DIR})
 else ()
+  if ( BUILD_STATIC_BROKER )
+    set(ENABLE_STATIC_ONLY true)
+  endif()
   add_subdirectory(aux/broker)
 
-  set(brodeps ${brodeps} broker)
+  if ( BUILD_STATIC_BROKER )
+    set(brodeps ${brodeps} broker_static)
+  else()
+    set(brodeps ${brodeps} broker)
+  endif()
   include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/aux/broker
                              ${CMAKE_CURRENT_BINARY_DIR}/aux/broker)
 endif ()
diff --git a/VERSION b/VERSION
index 867192887e..baff7e1f33 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6-20
+2.6-22
diff --git a/aux/broker b/aux/broker
index 0e7218b4ab..63df57d444 160000
--- a/aux/broker
+++ b/aux/broker
@@ -1 +1 @@
-Subproject commit 0e7218b4abd98530fbea54d546f7bf99535e2127
+Subproject commit 63df57d44430af31da573956b639f869a339a3a8
diff --git a/configure b/configure
index ee2dcbe383..ada9d21322 100755
--- a/configure
+++ b/configure
@@ -52,6 +52,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
     --enable-perftools-debug use Google's perftools for debugging
     --enable-jemalloc      link against jemalloc
     --enable-broccoli      build or install the Broccoli library (deprecated)
+    --enable-static-broker build broker statically (ignored if --with-broker is specified)
     --disable-broctl       don't install Broctl
     --disable-auxtools     don't build or install auxiliary tools
     --disable-perftools    don't try to build with Google Perftools
@@ -223,6 +224,9 @@ while [ $# -ne 0 ]; do
             append_cache_entry DISABLE_RUBY_BINDINGS     BOOL   true
             append_cache_entry INSTALL_BROCCOLI     BOOL   yes
             ;;
+        --enable-static-broker)
+            append_cache_entry BUILD_STATIC_BROKER    BOOL    true
+            ;;
         --disable-broctl)
             append_cache_entry INSTALL_BROCTL       BOOL   false
             ;;