diff --git a/.cirrus.yml b/.cirrus.yml
index f6530b155d..fdda43e6da 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -3,7 +3,8 @@ btest_jobs: &BTEST_JOBS 4
 btest_retries: &BTEST_RETRIES 2
 memory: &MEMORY 4GB
 
-config: &CONFIG --build-type=release --enable-cpp-tests  --disable-broker-tests --prefix=$CIRRUS_WORKING_DIR/install
+config: &CONFIG --build-type=release --enable-cpp-tests --disable-broker-tests --prefix=$CIRRUS_WORKING_DIR/install
+static_config: &STATIC_CONFIG --build-type=release --enable-cpp-tests --disable-broker-tests --enable-static-broker --enable-static-binpac --prefix=$CIRRUS_WORKING_DIR/install
 sanitizer_config: &SANITIZER_CONFIG --build-type=debug --enable-cpp-tests --disable-broker-tests --sanitizers=address,undefined --enable-fuzzers --enable-coverage
 
 resources_template: &RESOURCES_TEMPLATE
@@ -113,6 +114,16 @@ debian10_task:
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
 
+debian10_static_task:
+  container:
+    # Just uses a recent/common distro to run a static compile test.
+    # Debian 10 EOL: June 2024
+    dockerfile: ci/debian-10/Dockerfile
+    << : *RESOURCES_TEMPLATE
+  << : *CI_TEMPLATE
+  env:
+    ZEEK_CI_CONFIGURE_FLAGS: *STATIC_CONFIG
+
 debian9_task:
   container:
     # Debian 9 EOL: June 2022
diff --git a/CHANGES b/CHANGES
index 7e0e389f40..8e4523f4f5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+
+3.3.0-dev.600 | 2020-12-03 18:02:22 -0800
+
+  * Add a CI task for compiling with static broker/binpac (Johanna Amann, Corelight)
+
 3.3.0-dev.596 | 2020-12-03 09:35:42 -0700
 
   * Fix a couple of life-time issues when plugin loading fails.
diff --git a/VERSION b/VERSION
index 6edf701c0e..799a9e16ed 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.3.0-dev.596
+3.3.0-dev.600