diff --git a/.cirrus.yml b/.cirrus.yml
index 8ac0c6f9b3..15a41cdd97 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -18,6 +18,15 @@ resources_template: &RESOURCES_TEMPLATE
   cpu: *CPUS
   memory: *MEMORY
 
+macos_resources_template: &MACOS_RESOURCES_TEMPLATE
+  # cpu/memory setting is implicitly 2 core / 4 thread and 8GB, and
+  # trying to set it explicitly results in an error.
+  env:
+    ZEEK_CI_CPUS: 4
+    ZEEK_CI_BTEST_JOBS: 4
+    # No permission to write to default location of /zeek
+    CIRRUS_WORKING_DIR: /tmp/zeek
+
 ci_template: &CI_TEMPLATE
   only_if: >
     $CIRRUS_PR != '' ||
@@ -166,21 +175,21 @@ ubuntu16_task:
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
 
-# Apple doesn't publish official long-term support timelines, so easiest
-# option is to only support the latest macOS release or whatever latest
-# image is available.
-macos_task:
+# Apple doesn't publish official long-term support timelines.
+# We aim to support both the current and previous macOS release.
+macos_big_sur_task:
   osx_instance:
-    image: catalina-base
-    # cpu/memory setting is implicitly 2 core / 4 thread and 8GB, and
-    # trying to set it explicitly results in an error.
+    image: big-sur-base
   prepare_script: ./ci/macos/prepare.sh
   << : *CI_TEMPLATE
-  env:
-    ZEEK_CI_CPUS: 4
-    ZEEK_CI_BTEST_JOBS: 4
-    # No permission to write to default location of /zeek
-    CIRRUS_WORKING_DIR: /tmp/zeek
+  << : *MACOS_RESOURCES_TEMPLATE
+
+macos_catalina_task:
+  osx_instance:
+    image: catalina-base
+  prepare_script: ./ci/macos/prepare.sh
+  << : *CI_TEMPLATE
+  << : *MACOS_RESOURCES_TEMPLATE
 
 # FreeBSD EOL timelines: https://www.freebsd.org/security/security.html#sup
 freebsd12_task:
diff --git a/CHANGES b/CHANGES
index c6b59410c1..b89c7c79cb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+4.1.0-dev.12 | 2020-12-21 10:55:13 -0800
+
+  * Add MacOS Big Sur to CI (Christian Kreibich, Corelight)
+
 4.1.0-dev.10 | 2020-12-17 16:11:10 -0800
 
   * Remove explicit use of config mode for finding CAF (Dominik Charousset, Corelight)
diff --git a/VERSION b/VERSION
index 3bf025c9b4..79593078cf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.1.0-dev.10
+4.1.0-dev.12
diff --git a/auxil/broker b/auxil/broker
index 43ce69c1f4..0aef01d2dd 160000
--- a/auxil/broker
+++ b/auxil/broker
@@ -1 +1 @@
-Subproject commit 43ce69c1f428f0ec34c53e879dd43651a0b1e5a3
+Subproject commit 0aef01d2dd74cd945ed8a64412664920953dfd10
diff --git a/auxil/zeek-archiver b/auxil/zeek-archiver
index 61fe5ed341..49c49193f8 160000
--- a/auxil/zeek-archiver
+++ b/auxil/zeek-archiver
@@ -1 +1 @@
-Subproject commit 61fe5ed341a17b146eea624dd526855834b193fb
+Subproject commit 49c49193f8869b9bce8dfc992901d7ec60c1d37e