diff --git a/NEWS b/NEWS
index 485919b7e3..ea7dbab59c 100644
--- a/NEWS
+++ b/NEWS
@@ -40,6 +40,11 @@ This release fixes the following bugs:
 - Fixed undefined symbols being reported from Spicy when building some of the
   binary packages for Zeek.
 
+- Loading ``policy/frameworks/notice/community-id.zeek`` now also automatically
+  community ID logging. In the past, loading the script had no effect unless
+  ``policy/protocols/conn/community-id-logging.zeek`` was loaded before. This
+  was fairly unusual and hard to debug behavior.
+
 Zeek 6.0.0
 ==========
 
diff --git a/scripts/policy/frameworks/notice/community-id.zeek b/scripts/policy/frameworks/notice/community-id.zeek
index 122d3adba5..a1b9a65659 100644
--- a/scripts/policy/frameworks/notice/community-id.zeek
+++ b/scripts/policy/frameworks/notice/community-id.zeek
@@ -1,11 +1,9 @@
-# Source this script in addition to protocols/conn/community-id
-# to add Community ID to notices.
+# Source this script to add Community ID to notices.
+# This script will automatically load the main community-id script.
 
-# Only support loading this if the main script is also loaded.
 @load base/protocols/conn
 @load base/frameworks/notice
-
-@ifdef ( CommunityID::seed )
+@load policy/protocols/conn/community-id-logging
 
 module CommunityID::Notice;
 
@@ -23,6 +21,5 @@ export {
 hook Notice::notice(n: Notice::Info)
 	{
 	if ( CommunityID::Notice::enabled && n?$conn )
-		n$community_id = community_id_v1(n$conn$id);
+		n$community_id = community_id_v1(n$conn$id, CommunityID::seed, CommunityID::do_base64);
 	}
-@endif
diff --git a/testing/external/commit-hash.zeek-testing b/testing/external/commit-hash.zeek-testing
index d57e1cb4df..bb06f51cb9 100644
--- a/testing/external/commit-hash.zeek-testing
+++ b/testing/external/commit-hash.zeek-testing
@@ -1 +1 @@
-828845c99306c6d5d6811fa42987de5b16f530b9
+f0dfda82f616d478df1a290116b4b7efdd82f00a
diff --git a/testing/external/commit-hash.zeek-testing-private b/testing/external/commit-hash.zeek-testing-private
index c5dd200880..3a2dfa8e61 100644
--- a/testing/external/commit-hash.zeek-testing-private
+++ b/testing/external/commit-hash.zeek-testing-private
@@ -1 +1 @@
-b121bfe4d869f1f5e334505b970cd456558ef6a1
+eea2f9972f5b103048a40d07b3f14c41d92336bc