diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 40cb2eb..1b55d1b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,10 +34,9 @@ jobs:
           submodules: recursive
 
       - name: Setup Zig
-        uses: mlugg/setup-zig@v1
+        uses: mlugg/setup-zig@v2.0.5
         with:
-          version: 0.14.0
-
+          version: 0.15.1
       - name: Build
         run: zig build -Dtarget=${{ matrix.target }} -Doptimize=${{ matrix.optimize }}
   test:
@@ -52,9 +51,9 @@ jobs:
           submodules: recursive
 
       - name: Setup Zig
-        uses: mlugg/setup-zig@v1
+        uses: mlugg/setup-zig@v2.0.5
         with:
-          version: 0.14.0
+          version: 0.15.1
 
       - name: Test
         run: zig build test
diff --git a/build.zig b/build.zig
index 5d41d35..f4ade9d 100644
--- a/build.zig
+++ b/build.zig
@@ -32,9 +32,11 @@ pub fn build(b: *Build) void {
 
     const selftest = b.addExecutable(.{
         .name = "selftest",
-        .target = target,
-        .optimize = optimize,
-        .link_libc = true,
+        .root_module = b.createModule(.{
+            .target = target,
+            .optimize = optimize,
+            .link_libc = true,
+        }),
     });
     selftest.root_module.addCMacro("MBEDTLS_SELF_TEST", "");
     selftest.addCSourceFile(.{
diff --git a/build.zig.zon b/build.zig.zon
index c123ab6..71b4465 100644
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -1,11 +1,12 @@
 .{
     .name = .mbedtls,
     .fingerprint = 0x841b00c247548313,
-    .version = "3.6.2",
+    .version = "3.6.4",
+    .minimum_zig_version = "0.15.1",
     .dependencies = .{
         .mbedtls = .{
-            .url = "https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/mbedtls-3.6.2.tar.gz",
-            .hash = "N-V-__8AAPnFhALfI8HonTAfQwJlGPkOdcv9kdkvnmLlJDJo",
+            .url = "git+https://github.com/Mbed-TLS/mbedtls.git?ref=v3.6.4#c765c831e5c2a0971410692f92f7a81d6ec65ec2",
+            .hash = "N-V-__8AADE9jALWhPS2ykOLbf8gUmr9r-SBwyzzpccbtBAv",
         },
     },
     .paths = .{