diff --git a/aux/broker b/aux/broker
index 98da283ba2..694af9d9ed 160000
--- a/aux/broker
+++ b/aux/broker
@@ -1 +1 @@
-Subproject commit 98da283ba2bc4dc20e67830395299defc21724db
+Subproject commit 694af9d9edd188a461cc762bfdb7b61688b93ada
diff --git a/doc/frameworks/broker.rst b/doc/frameworks/broker.rst
index 26006089d1..3cd8dab6e3 100644
--- a/doc/frameworks/broker.rst
+++ b/doc/frameworks/broker.rst
@@ -11,8 +11,8 @@ Broker-Enabled Communication Framework
     <../components/broker/README.html>`_ to exchange information with
     other Bro processes.  To enable it run Bro's ``configure`` script
     with the ``--enable-broker`` option.  Note that a C++11 compatible
-    compiler is required as well as the `C++ Actor Framework
-    <http://actor-framework.org/>`_.
+    compiler (e.g. GCC 4.8+ or Clang 3.3+) is required as well as the
+    `C++ Actor Framework <http://actor-framework.org/>`_.
 
 .. contents::
 
diff --git a/src/broker/Data.cc b/src/broker/Data.cc
index 45f5415b8a..8f66427bb5 100644
--- a/src/broker/Data.cc
+++ b/src/broker/Data.cc
@@ -319,7 +319,7 @@ struct val_converter {
 		auto rt = type->AsRecordType();
 		auto rval = new RecordVal(rt);
 
-		for ( auto i = 0; i < rt->NumFields(); ++i )
+		for ( auto i = 0u; i < static_cast<size_t>(rt->NumFields()); ++i )
 			{
 			if ( require_log_attr && ! rt->FieldDecl(i)->FindAttr(ATTR_LOG) )
 				continue;
diff --git a/src/broker/Manager.cc b/src/broker/Manager.cc
index 31599ea1fc..eadadea137 100644
--- a/src/broker/Manager.cc
+++ b/src/broker/Manager.cc
@@ -210,7 +210,7 @@ bool bro_broker::Manager::Log(EnumVal* stream, RecordVal* columns, RecordType* i
 
 	broker::record column_data;
 
-	for ( auto i = 0u; i < info->NumFields(); ++i )
+	for ( auto i = 0u; i < static_cast<size_t>(info->NumFields()); ++i )
 		{
 		if ( ! info->FieldDecl(i)->FindAttr(ATTR_LOG) )
 			continue;