diff --git a/CHANGES b/CHANGES
index 142336564f..8913a9416d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+6.0.2-12 | 2024-01-12 12:21:52 -0700
+
+  * Pick up upstream CAF patch for flow::from_steps (Tim Wojtulewicz, Corelight)
+
 6.0.2-11 | 2024-01-12 12:15:56 -0700
 
   * Update zeekctl submodule [nomail] (Tim Wojtulewicz, Corelight)
diff --git a/VERSION b/VERSION
index 5e3a3fa81d..67a9d4a982 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.2-11
+6.0.2-12
diff --git a/auxil/broker b/auxil/broker
index 3df8d35732..b7e4bc8c8c 160000
--- a/auxil/broker
+++ b/auxil/broker
@@ -1 +1 @@
-Subproject commit 3df8d35732d51e3bd41db067260998e79e93f366
+Subproject commit b7e4bc8c8ce797a5d49dc81eb2aa9cec1ae74e5b