diff --git a/CHANGES b/CHANGES
index e1dbc6bfcf..69976ba603 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,12 @@
 
+2.5-671 | 2018-06-21 11:55:39 -0500
+
+  * Add ability for BroControl to skip cluster setup (Corelight)
+
+  * BIT-1938: fix crash in Broker manager shutdown (Corelight)
+
+  * Disable broxygen when running unit tests (Daniel Thayer)
+
 2.5-668 | 2018-06-15 17:14:33 -0500
 
   * Make old comm. system usages an error unless old_comm_usage_is_ok is set
diff --git a/VERSION b/VERSION
index 483a2c482b..fd8c8172cf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5-668
+2.5-671
diff --git a/aux/broctl b/aux/broctl
index 99ef926d09..c5dd2ba83d 160000
--- a/aux/broctl
+++ b/aux/broctl
@@ -1 +1 @@
-Subproject commit 99ef926d09a144a9919dec01f6231692e170120e
+Subproject commit c5dd2ba83dda185d2008731a5cd25b2b8131ac78
diff --git a/scripts/base/frameworks/cluster/setup-connections.bro b/scripts/base/frameworks/cluster/setup-connections.bro
index a06d66bc0c..63ddbdd8b0 100644
--- a/scripts/base/frameworks/cluster/setup-connections.bro
+++ b/scripts/base/frameworks/cluster/setup-connections.bro
@@ -44,6 +44,9 @@ function connect_peers_with_type(node_type: NodeType)
 
 event bro_init() &priority=-10
 	{
+	if ( getenv("BROCTL_CHECK_CONFIG") != "" )
+		return;
+
 	local self = nodes[node];
 
 	for ( i in registered_pools )