diff --git a/CHANGES b/CHANGES
index d52122b357..89a77f268c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+8.0.0-dev.794 | 2025-07-29 07:41:13 -0700
+
+  * Fix ConnKey deprecation warnings from generic fuzzer (Tim Wojtulewicz, Corelight)
+
 8.0.0-dev.792 | 2025-07-29 07:19:25 -0700
 
   * Fix types passed to some of the IRC analyzer events (Tim Wojtulewicz, Corelight)
diff --git a/VERSION b/VERSION
index 8820a5a9a7..436df1c185 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.0.0-dev.792
+8.0.0-dev.794
diff --git a/src/fuzzers/generic-analyzer-fuzzer.cc b/src/fuzzers/generic-analyzer-fuzzer.cc
index bdaf6c0fe8..cde184929d 100644
--- a/src/fuzzers/generic-analyzer-fuzzer.cc
+++ b/src/fuzzers/generic-analyzer-fuzzer.cc
@@ -17,9 +17,11 @@
 #include "zeek/analyzer/Manager.h"
 #include "zeek/analyzer/protocol/pia/PIA.h"
 #include "zeek/analyzer/protocol/tcp/TCP.h"
+#include "zeek/conn_key/Manager.h"
 #include "zeek/fuzzers/FuzzBuffer.h"
 #include "zeek/fuzzers/fuzzer-setup.h"
 #include "zeek/packet_analysis/protocol/ip/SessionAdapter.h"
+#include "zeek/packet_analysis/protocol/ip/conn_key/IPBasedConnKey.h"
 #include "zeek/packet_analysis/protocol/tcp/TCPSessionAdapter.h"
 #include "zeek/packet_analysis/protocol/udp/UDPSessionAdapter.h"
 #include "zeek/session/Manager.h"
@@ -33,7 +35,7 @@ static const char* FUZZ_ANALYZER_TRANSPORT = TOSTRING(ZEEK_FUZZ_ANALYZER_TRANSPO
 
 class Fuzzer {
 public:
-    Fuzzer(TransportProto proto, const zeek::Tag& analyzer_tag) : proto{proto}, analyzer_tag{analyzer_tag} {}
+    Fuzzer(TransportProto proto, zeek::Tag analyzer_tag) : proto{proto}, analyzer_tag{std::move(analyzer_tag)} {}
 
     virtual ~Fuzzer() {};
 
@@ -41,16 +43,12 @@ public:
         static constexpr double network_time_start = 1439471031;
         zeek::run_state::detail::update_network_time(network_time_start);
 
+        zeek::ConnKeyPtr ck = zeek::conn_key_mgr->GetFactory().NewConnKey();
+        zeek::IPBasedConnKeyPtr key = zeek::IPBasedConnKeyPtr(static_cast<zeek::IPBasedConnKey*>(ck.release()));
+        key->InitTuple(zeek::IPAddr("1.2.3.4"), htons(23132), zeek::IPAddr("5.6.7.8"), htons(80), proto, false);
+
         zeek::Packet p;
-        zeek::ConnTuple conn_id;
-        conn_id.src_addr = zeek::IPAddr("1.2.3.4");
-        conn_id.dst_addr = zeek::IPAddr("5.6.7.8");
-        conn_id.src_port = htons(23132);
-        conn_id.dst_port = htons(80);
-        conn_id.is_one_way = false;
-        conn_id.proto = proto;
-        zeek::detail::ConnKey key(conn_id);
-        zeek::Connection* conn = new zeek::Connection(key, network_time_start, &conn_id, 1, &p);
+        zeek::Connection* conn = new zeek::Connection(std::move(key), network_time_start, 1, &p);
         conn->SetTransport(proto);
         zeek::session_mgr->Insert(conn);
         return conn;