diff --git a/CHANGES b/CHANGES
index 34a66143e2..376cef7ddf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+
+4.1.0-dev.580 | 2021-04-30 18:29:22 -0700
+
+  * Add missing zeek/ prefix to a telemetry header's includes (Jon Siwek, Corelight)
+
 4.1.0-dev.578 | 2021-04-30 09:42:26 -0700
 
   * GH-1534: Fix excessive coredump for duplicate enum definitions
diff --git a/VERSION b/VERSION
index 123e10b546..bd07621e5b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.1.0-dev.578
+4.1.0-dev.580
diff --git a/doc b/doc
index 2a15abfe40..e9f80f7554 160000
--- a/doc
+++ b/doc
@@ -1 +1 @@
-Subproject commit 2a15abfe404d5a1816dadbf33ae5751f66c7aa0a
+Subproject commit e9f80f75548a12cfbc711a4c69d3135e0ad105e3
diff --git a/src/telemetry/MetricFamily.h b/src/telemetry/MetricFamily.h
index 50e59b22e4..ea0f483004 100644
--- a/src/telemetry/MetricFamily.h
+++ b/src/telemetry/MetricFamily.h
@@ -6,7 +6,7 @@
 #include <string_view>
 #include <utility>
 
-#include "Span.h"
+#include "zeek/Span.h"
 
 namespace zeek::telemetry {
 
diff --git a/testing/external/commit-hash.zeek-testing-private b/testing/external/commit-hash.zeek-testing-private
index 69b3e7dfd4..0a1ffaf2e1 100644
--- a/testing/external/commit-hash.zeek-testing-private
+++ b/testing/external/commit-hash.zeek-testing-private
@@ -1 +1 @@
-2e7a42892a8cf429787246dbba3927685799b56f
+c3c400302b380e35b6f274038b3cedc8a8df7391