diff --git a/aux/broker b/aux/broker
index 8b2c9a9e1e..35eb209c18 160000
--- a/aux/broker
+++ b/aux/broker
@@ -1 +1 @@
-Subproject commit 8b2c9a9e1e67d145af442fa2175dcb18b643a317
+Subproject commit 35eb209c18dd49d020994162eb20f73f0257681c
diff --git a/configure b/configure
index 48c35e64a5..019e8083a8 100755
--- a/configure
+++ b/configure
@@ -267,7 +267,8 @@ while [ $# -ne 0 ]; do
             append_cache_entry DISABLE_PYTHON_BINDINGS     BOOL   true
             ;;
         --disable-broker-tests)
-            append_cache_entry BROKER_DISABLE_TESTS     BOOL   true
+            append_cache_entry BROKER_DISABLE_TESTS        BOOL true
+            append_cache_entry BROKER_DISABLE_DOC_EXAMPLES BOOL true
             ;;
         --with-openssl=*)
             append_cache_entry OPENSSL_ROOT_DIR PATH $optarg