diff --git a/CHANGES b/CHANGES
index 5cbec754f4..4e8d2ada45 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.5-849 | 2018-08-17 10:29:58 -0500
+
+  * Fix possible race in netcontrol acld/broker plugins (Jon Siwek, Corelight)
+
 2.5-848 | 2018-08-16 17:21:28 -0500
 
   * Enable SMB by default by moving scripts from policy/ to base/
diff --git a/VERSION b/VERSION
index 3c34b2649e..0eef8063da 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5-848
+2.5-849
diff --git a/scripts/base/frameworks/netcontrol/plugins/acld.bro b/scripts/base/frameworks/netcontrol/plugins/acld.bro
index 38466cdf41..99a9166ce9 100644
--- a/scripts/base/frameworks/netcontrol/plugins/acld.bro
+++ b/scripts/base/frameworks/netcontrol/plugins/acld.bro
@@ -270,8 +270,8 @@ function acld_remove_rule_fun(p: PluginState, r: Rule, reason: string) : bool
 
 function acld_init(p: PluginState)
 	{
-	Broker::peer(cat(p$acld_config$acld_host), p$acld_config$acld_port);
 	Broker::subscribe(p$acld_config$acld_topic);
+	Broker::peer(cat(p$acld_config$acld_host), p$acld_config$acld_port);
 	}
 
 event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)
diff --git a/scripts/base/frameworks/netcontrol/plugins/broker.bro b/scripts/base/frameworks/netcontrol/plugins/broker.bro
index f4b8715c38..4bfb231c94 100644
--- a/scripts/base/frameworks/netcontrol/plugins/broker.bro
+++ b/scripts/base/frameworks/netcontrol/plugins/broker.bro
@@ -164,8 +164,8 @@ function broker_remove_rule_fun(p: PluginState, r: Rule, reason: string) : bool
 
 function broker_init(p: PluginState)
 	{
-	Broker::peer(cat(p$broker_config$host), p$broker_config$bport);
 	Broker::subscribe(p$broker_config$topic);
+	Broker::peer(cat(p$broker_config$host), p$broker_config$bport);
 	}
 
 event Broker::peer_added(endpoint: Broker::EndpointInfo, msg: string)