diff --git a/CHANGES b/CHANGES
index 3bfd731d6c..6af1b3aea3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+6.0.0-dev.312 | 2023-04-04 09:05:34 -0700
+
+  * Update gen-zam submodule for std::move warnings (Tim Wojtulewicz, Corelight)
+
 6.0.0-dev.310 | 2023-04-04 10:00:24 +0200
 
   * test suite update for minor change in "when" error messages (Vern Paxson, Corelight)
diff --git a/VERSION b/VERSION
index 962029fbc9..e2f8bf0a3a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.0-dev.310
+6.0.0-dev.312
diff --git a/auxil/gen-zam b/auxil/gen-zam
index 8c9afe4a48..8534f719a0 160000
--- a/auxil/gen-zam
+++ b/auxil/gen-zam
@@ -1 +1 @@
-Subproject commit 8c9afe4a48a291e714c3a8031bad9867c4b4c665
+Subproject commit 8534f719a0a384769383bbd4ad71c9eb2084823d