diff --git a/CHANGES b/CHANGES
index 2e88d251b7..2305373902 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+8.1.0-dev.22 | 2025-08-07 08:39:27 -0700
+
+  * Update zeek-aux to remove BRO_DIST from plugin skeleton (Tim Wojtulewicz, Corelight)
+
+  * cmake_minimum_required() should come before project() (Tim Wojtulewicz, Corelight)
+
 8.1.0-dev.19 | 2025-08-07 10:48:40 +0200
 
   * btest/tap-analyzer: Update existing test and add new one for UpdateConnVal() (Arne Welzel, Corelight)
diff --git a/VERSION b/VERSION
index 69e235eaaa..554d825054 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.1.0-dev.19
+8.1.0-dev.22
diff --git a/auxil/zeek-aux b/auxil/zeek-aux
index 6c72725b18..9a51ce1940 160000
--- a/auxil/zeek-aux
+++ b/auxil/zeek-aux
@@ -1 +1 @@
-Subproject commit 6c72725b184cc5fd7d12cea5084f0f51de3e82e3
+Subproject commit 9a51ce1940a808aaad253077905c2b34f15f1e08
diff --git a/testing/btest/plugins/binpac-flowbuffer-frame-length-plugin/CMakeLists.txt b/testing/btest/plugins/binpac-flowbuffer-frame-length-plugin/CMakeLists.txt
index 0175e1da6d..60d6eef056 100644
--- a/testing/btest/plugins/binpac-flowbuffer-frame-length-plugin/CMakeLists.txt
+++ b/testing/btest/plugins/binpac-flowbuffer-frame-length-plugin/CMakeLists.txt
@@ -1,7 +1,7 @@
-project(Zeek-Plugin-Foo-FOO)
-
 cmake_minimum_required(VERSION 3.15)
 
+project(Zeek-Plugin-Foo-FOO)
+
 if (NOT ZEEK_DIST)
     message(FATAL_ERROR "ZEEK_DIST not set")
 endif ()
diff --git a/testing/btest/plugins/conflict-plugin/CMakeLists.txt b/testing/btest/plugins/conflict-plugin/CMakeLists.txt
index 64c10fac4f..c5edb8b577 100644
--- a/testing/btest/plugins/conflict-plugin/CMakeLists.txt
+++ b/testing/btest/plugins/conflict-plugin/CMakeLists.txt
@@ -1,7 +1,7 @@
-project(Zeek-Plugin-Conflict-Plugin)
-
 cmake_minimum_required(VERSION 3.15)
 
+project(Zeek-Plugin-Conflict-Plugin)
+
 if (NOT ZEEK_DIST)
     message(FATAL_ERROR "ZEEK_DIST not set")
 endif ()
diff --git a/testing/btest/plugins/connkey-plugin/CMakeLists.txt b/testing/btest/plugins/connkey-plugin/CMakeLists.txt
index 5945ecac62..a669061826 100644
--- a/testing/btest/plugins/connkey-plugin/CMakeLists.txt
+++ b/testing/btest/plugins/connkey-plugin/CMakeLists.txt
@@ -1,7 +1,7 @@
-project(Zeek-Plugin-Demo-Foo)
-
 cmake_minimum_required(VERSION 3.15)
 
+project(Zeek-Plugin-Demo-Foo)
+
 if (NOT ZEEK_DIST)
     message(FATAL_ERROR "ZEEK_DIST not set")
 endif ()
diff --git a/testing/btest/plugins/file-plugin/CMakeLists.txt b/testing/btest/plugins/file-plugin/CMakeLists.txt
index e57542dd9b..1ab4567b89 100644
--- a/testing/btest/plugins/file-plugin/CMakeLists.txt
+++ b/testing/btest/plugins/file-plugin/CMakeLists.txt
@@ -1,12 +1,12 @@
-project(Zeek-Plugin-Demo-Foo)
-
 cmake_minimum_required(VERSION 3.15)
 
-if (NOT BRO_DIST)
-    message(FATAL_ERROR "BRO_DIST not set")
+project(Zeek-Plugin-Demo-Foo)
+
+if (NOT ZEEK_DIST)
+    message(FATAL_ERROR "ZEEK_DIST not set")
 endif ()
 
-set(CMAKE_MODULE_PATH ${BRO_DIST}/cmake)
+set(CMAKE_MODULE_PATH ${ZEEK_DIST}/cmake)
 
 include(ZeekPlugin)
 
diff --git a/testing/btest/plugins/packet-protocol-plugin/CMakeLists.txt b/testing/btest/plugins/packet-protocol-plugin/CMakeLists.txt
index d245a214ad..8169744779 100644
--- a/testing/btest/plugins/packet-protocol-plugin/CMakeLists.txt
+++ b/testing/btest/plugins/packet-protocol-plugin/CMakeLists.txt
@@ -1,7 +1,7 @@
-project(Zeek-Packet-Plugin-Demo)
-
 cmake_minimum_required(VERSION 3.15)
 
+project(Zeek-Packet-Plugin-Demo)
+
 if (NOT ZEEK_DIST)
     message(FATAL_ERROR "ZEEK_DIST not set")
 endif ()
diff --git a/testing/btest/plugins/pktdumper-plugin/CMakeLists.txt b/testing/btest/plugins/pktdumper-plugin/CMakeLists.txt
index 9b59801cae..1c5152fab7 100644
--- a/testing/btest/plugins/pktdumper-plugin/CMakeLists.txt
+++ b/testing/btest/plugins/pktdumper-plugin/CMakeLists.txt
@@ -1,7 +1,7 @@
-project(Zeek-Plugin-Demo-Foo)
-
 cmake_minimum_required(VERSION 3.15)
 
+project(Zeek-Plugin-Demo-Foo)
+
 if (NOT ZEEK_DIST)
     message(FATAL_ERROR "ZEEK_DIST not set")
 endif ()
diff --git a/testing/btest/plugins/pktsrc-plugin/CMakeLists.txt b/testing/btest/plugins/pktsrc-plugin/CMakeLists.txt
index 9b59801cae..1c5152fab7 100644
--- a/testing/btest/plugins/pktsrc-plugin/CMakeLists.txt
+++ b/testing/btest/plugins/pktsrc-plugin/CMakeLists.txt
@@ -1,7 +1,7 @@
-project(Zeek-Plugin-Demo-Foo)
-
 cmake_minimum_required(VERSION 3.15)
 
+project(Zeek-Plugin-Demo-Foo)
+
 if (NOT ZEEK_DIST)
     message(FATAL_ERROR "ZEEK_DIST not set")
 endif ()
diff --git a/testing/btest/plugins/protocol-plugin/CMakeLists.txt b/testing/btest/plugins/protocol-plugin/CMakeLists.txt
index da3e5c3940..8f05bca204 100644
--- a/testing/btest/plugins/protocol-plugin/CMakeLists.txt
+++ b/testing/btest/plugins/protocol-plugin/CMakeLists.txt
@@ -1,7 +1,7 @@
-project(Zeek-Plugin-Demo-Foo)
-
 cmake_minimum_required(VERSION 3.15)
 
+project(Zeek-Plugin-Demo-Foo)
+
 if (NOT ZEEK_DIST)
     message(FATAL_ERROR "ZEEK_DIST not set")
 endif ()
diff --git a/testing/btest/plugins/reader-plugin/CMakeLists.txt b/testing/btest/plugins/reader-plugin/CMakeLists.txt
index 9b59801cae..1c5152fab7 100644
--- a/testing/btest/plugins/reader-plugin/CMakeLists.txt
+++ b/testing/btest/plugins/reader-plugin/CMakeLists.txt
@@ -1,7 +1,7 @@
-project(Zeek-Plugin-Demo-Foo)
-
 cmake_minimum_required(VERSION 3.15)
 
+project(Zeek-Plugin-Demo-Foo)
+
 if (NOT ZEEK_DIST)
     message(FATAL_ERROR "ZEEK_DIST not set")
 endif ()
diff --git a/testing/btest/plugins/writer-plugin/CMakeLists.txt b/testing/btest/plugins/writer-plugin/CMakeLists.txt
index 9b59801cae..1c5152fab7 100644
--- a/testing/btest/plugins/writer-plugin/CMakeLists.txt
+++ b/testing/btest/plugins/writer-plugin/CMakeLists.txt
@@ -1,7 +1,7 @@
-project(Zeek-Plugin-Demo-Foo)
-
 cmake_minimum_required(VERSION 3.15)
 
+project(Zeek-Plugin-Demo-Foo)
+
 if (NOT ZEEK_DIST)
     message(FATAL_ERROR "ZEEK_DIST not set")
 endif ()