diff --git a/CHANGES b/CHANGES
index 041f1a6782..ecf5f0bf45 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,19 @@
+6.0.3-18 | 2024-05-14 16:28:29 -0700
+
+  * Update broker submodule [nomail] (Tim Wojtulewicz, Corelight)
+
+  * Parse and store localversion string (Peter Cullen, Corelight)
+
+    (cherry picked from commit d09584e52e96fe4d5cb3d211e18ece53668bf568)
+
+  * Update version string btests for localversion (Peter Cullen, Corelight)
+
+    (cherry picked from commit d09584e52e96fe4d5cb3d211e18ece53668bf568)
+
+  * Support for configurable localversion (Peter Cullen, Corelight)
+
+    (cherry picked from commit d09584e52e96fe4d5cb3d211e18ece53668bf568)
+
 6.0.3-15 | 2024-05-14 14:52:34 -0700
 
   * Update core.pcap.filter-warning baseline (Peter Cullen, Corelight)
diff --git a/VERSION b/VERSION
index 710e8f7ac1..cf5aef904a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.3-15
+6.0.3-18
diff --git a/auxil/broker b/auxil/broker
index b7e4bc8c8c..095bf99307 160000
--- a/auxil/broker
+++ b/auxil/broker
@@ -1 +1 @@
-Subproject commit b7e4bc8c8ce797a5d49dc81eb2aa9cec1ae74e5b
+Subproject commit 095bf99307a1c4ed464c9643ddba6073b3877656