diff --git a/CHANGES b/CHANGES
index 763f5000f6..337df6474d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+7.1.0-dev.816 | 2024-12-13 12:59:08 +0100
+
+  * zeekygen: Disable Cluster::Experimental module (Arne Welzel, Corelight)
+
+    The nodes-experimental/manager.zeek file ends up calling Broker::publish()
+    unconditionally, resulting in a warning. Skip running that code when
+    generating documentation.
+
 7.1.0-dev.814 | 2024-12-13 10:57:19 +0100
 
   * BTest updates in support of compiling-scripts-to-C++ (Vern Paxson, Corelight)
diff --git a/VERSION b/VERSION
index b07c88d0c1..4bc13a12b2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.1.0-dev.814
+7.1.0-dev.816
diff --git a/scripts/zeekygen/__load__.zeek b/scripts/zeekygen/__load__.zeek
index b7ac6992a6..802a79d2cc 100644
--- a/scripts/zeekygen/__load__.zeek
+++ b/scripts/zeekygen/__load__.zeek
@@ -32,6 +32,7 @@ event zeek_init() &priority=1000
 	# probably disable all modules, too.
 	disable_module_events("Control");
 	disable_module_events("Cluster::Backend::ZeroMQ");
+	disable_module_events("Cluster::Experimental");
 	disable_module_events("Management::Agent::Runtime");
 	disable_module_events("Management::Controller::Runtime");
 	disable_module_events("Management::Node");